Linus Torvalds 1eb6337835 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits) [media] pctv452e: Remove bogus code [media] adv7175: Make use of media bus pixel codes [media] media: vb2: fix incorrect return value [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES [media] cx23885: Stop the risc video fifo before reconfiguring it [media] cx23885: Avoid incorrect error handling and reporting [media] cx23885: Avoid stopping the risc engine during buffer timeout [media] cx23885: Removed a spurious function cx23885_set_scale() [media] cx23885: v4l2 api compliance, set the audioset field correctly [media] cx23885: hook the audio selection functions into the main driver [media] cx23885: add generic functions for dealing with audio input selection [media] cx23885: fixes related to maximum number of inputs and range checking [media] cx23885: Initial support for the MPX-885 mini-card [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use [media] cx23885: Enable audio line in support from the back panel [media] cx23885: Allow the audio mux config to be specified on a per input basis [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs [media] cx23885: Name an internal i2c part and declare a bitfield by name [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming [media] cx23885: remove channel dump diagnostics when a vbi buffer times out ... Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header file rename vs add)		2011-10-31 15:42:54 -07:00
..
gameport	i8253: Create linux/i8253.h and use it in all 8253 related files	2011-06-09 15:01:37 +02:00
joystick	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-08-24 09:19:03 -07:00
keyboard	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-10-27 08:44:20 +02:00
misc	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2011-10-31 15:42:54 -07:00
mouse	Merge branch 'next' into for-linus	2011-10-26 21:46:20 -07:00
serio	Input: serio_raw - fix memory leak when closing char device	2011-10-10 18:35:23 -07:00
tablet	Merge branch 'next' into for-linus	2011-10-26 21:46:20 -07:00
touchscreen	Merge branch 'next' into for-linus	2011-10-26 21:46:20 -07:00
apm-power.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
evbug.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
evdev.c	Input: evdev - try to wake up readers only if we have full packet	2011-06-18 02:54:02 -07:00
ff-core.c	Input: force feedback - potential integer wrap in input_ff_create()	2011-10-12 21:13:11 -07:00
ff-memless.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
fixp-arith.h	changed email	2007-10-20 00:47:32 +02:00
input-compat.c	Input: refactor evdev 32bit compat to be shareable with uinput	2008-10-27 22:03:42 -04:00
input-compat.h	arch/tile: finish enabling support for TILE-Gx 64-bit chip	2011-05-12 15:52:12 -04:00
input-mt.c	Input: add BTN_TOOL_QUINTTAP for reporting 5 fingers on touchpad	2011-08-23 23:08:29 -07:00
input-polldev.c	Input: polldev - immediately poll device upon opening	2011-08-09 01:32:45 -07:00
input.c	Input: properly assign return value of clamp() macro.	2011-05-25 09:24:58 -07:00
joydev.c	Input: remove useless synchronize_rcu() calls	2011-05-12 08:28:57 -07:00
Kconfig	Input: xen-kbdfront - move to drivers/input/misc	2011-03-16 23:26:01 -07:00
Makefile	Input: xen-kbdfront - move to drivers/input/misc	2011-03-16 23:26:01 -07:00
mousedev.c	Input: properly assign return value of clamp() macro.	2011-05-25 09:24:58 -07:00
sparse-keymap.c	Input: sparse-keymap - report KEY_UNKNOWN for unknown scan codes	2011-03-28 23:34:52 -07:00