Linus Torvalds 31b6ca0af7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig		2011-01-07 14:45:47 -08:00
..
alpha	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
avr32	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
blackfin	Merge branch 'usb-next' into musb-merge	2010-12-16 10:05:06 -08:00
cris	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
frv	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
h8300	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
ia64	fs: scale mntget/mntput	2011-01-07 17:50:33 +11:00
m32r	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
m68k	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
m68knommu	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
microblaze	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
mips	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
mn10300	arch/mn10300/kernel/irq.c: fix build	2011-01-03 16:36:33 -08:00
parisc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
powerpc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-01-06 12:30:19 -08:00
score	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
sh	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
sparc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
tile	arch/tile: handle rt_sigreturn() more cleanly	2010-12-17 16:59:29 -05:00
um	uml: disable winch irq before freeing handler data	2010-11-25 06:50:39 +09:00
x86	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 11:12:17 -08:00
xtensa	TTY: Add tty ioctl to figure device node of the system console.	2010-12-16 16:18:28 -08:00
.gitignore
Kconfig	mutexes, sched: Introduce arch_mutex_cpu_relax()	2010-11-26 15:05:34 +01:00