Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.		2011-01-13 10:05:56 -08:00
..
gameport	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
joystick	Merge branch 'next' into for-linus	2011-01-11 22:01:45 -08:00
keyboard	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-13 09:58:14 -08:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
mouse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-01-10 08:15:37 -08:00
serio	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
tablet	Merge branch 'next' into for-linus	2011-01-06 22:34:59 -08:00
touchscreen	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
Kconfig	Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2009-12-10 09:34:40 -08:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next	2010-12-16 09:17:48 -08: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	Merge branch 'next' into for-linus	2011-01-06 22:34:59 -08:00
ff-core.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08: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	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
input-mt.c	input: mt: Move tracking and pointer emulation to input-mt	2010-12-16 10:41:38 +01:00
input-polldev.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
input.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
joydev.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
mousedev.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
sparse-keymap.c	Input: sparse-keymap - switch to using new keycode interface	2010-09-09 22:01:07 -07:00
xen-kbdfront.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00