]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Fri, 8 Dec 2006 06:07:56 +0000 (01:07 -0500)
committerDmitry Torokhov <dtor@insightbb.com>
Fri, 8 Dec 2006 06:07:56 +0000 (01:07 -0500)
commitbef986502fa398b1785a3979b1aa17cd902d3527
treeb59c1afe7b1dfcc001b86e54863f550d7ddc8c34
parent4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c
parentc99767974ebd2a719d849fdeaaa1674456f5283f
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/usb/input/hid.h
13 files changed:
Documentation/DocBook/kernel-api.tmpl
drivers/input/gameport/gameport.c
drivers/input/keyboard/atkbd.c
drivers/input/keyboard/lkkbd.c
drivers/input/keyboard/sunkbd.c
drivers/input/mouse/psmouse-base.c
drivers/input/serio/serio.c
drivers/input/serio/serio_raw.c
drivers/input/touchscreen/ads7846.c
drivers/macintosh/Kconfig
drivers/usb/input/hid-core.c
drivers/usb/input/hid-input.c
drivers/usb/input/hid.h