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
..
accessibility
acpi	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 10:51:36 -08:00
amba
ata	pata_cs5536: avoid implicit MSR API inclusion on x86-64	2010-12-26 19:42:15 -05:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
auxdisplay
base
block	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
bluetooth
cdrom
char	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
clk
clocksource	clocksource: sh_cmt: Remove nested spinlock fix	2010-12-17 19:38:33 +09:00
connector
cpufreq	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
cpuidle	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
crypto
dca
dio
dma	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
edac	Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 10:50:28 -08:00
eisa
firewire	firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI	2010-12-12 15:47:02 +01:00
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	drm/i915/dvo: Report LVDS attached to ch701x as connected	2010-12-30 13:50:43 +00:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
hwmon	hwmon: (s3c-hwmon) Fix compilation	2011-01-02 15:31:11 -08:00
i2c	I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c	2010-12-20 17:53:04 -08:00
ide
idle	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
ieee802154
infiniband	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
isdn	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
leds	led_class: fix typo in blink API	2010-12-22 19:43:34 -08:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2010-12-20 09:19:46 -08:00
media	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
memstick
message
mfd	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
misc
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
mtd	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
net	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
nubus
of	of/i2c: Fix request module by alias	2010-12-24 01:28:54 -07:00
oprofile
parisc
parport
pci	PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c	2010-12-23 12:51:49 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 11:06:31 -08:00
pnp	ACPI/PNP: avoid section mismatch warning	2010-12-11 02:01:47 -05:00
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-01-07 12:47:02 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-01-07 12:47:02 -08:00
serial	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
sfi
sh	sh: intc: Initialize radix tree gfp mask explicitly.	2010-12-24 19:38:37 +09:00
sn
spi	spi/m68knommu: Coldfire QSPI platform support	2010-12-29 23:28:25 -07:00
ssb	ssb: Use pci_is_pcie()	2010-12-22 15:43:26 -05:00
staging	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
tc
telephony
thermal
tty	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
uio
usb	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
uwb	Merge branch 'usb-next' into musb-merge	2010-12-16 10:05:06 -08:00
vhost	Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost	2010-12-14 11:33:23 -08:00
video	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
virtio
vlynq
w1
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
xen
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00