]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit - net/rxrpc/krxiod.c
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4bdbd28 c997679)
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
treeb59c1afe7b1dfcc001b86e54863f550d7ddc8c34tree | snapshot
parent4bdbd2807deeccc0793d57fb5120d7a53f2c0b3ccommit | diff
parentc99767974ebd2a719d849fdeaaa1674456f5283fcommit | diff
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/usb/input/hid.h
13 files changed:
Documentation/DocBook/kernel-api.tmpl diff1 | diff2 | blob | history
drivers/input/gameport/gameport.c diff1 | diff2 | blob | history
drivers/input/keyboard/atkbd.c diff1 | diff2 | blob | history
drivers/input/keyboard/lkkbd.c diff1 | diff2 | blob | history
drivers/input/keyboard/sunkbd.c diff1 | diff2 | blob | history
drivers/input/mouse/psmouse-base.c diff1 | diff2 | blob | history
drivers/input/serio/serio.c diff1 | diff2 | blob | history
drivers/input/serio/serio_raw.c diff1 | diff2 | blob | history
drivers/input/touchscreen/ads7846.c diff1 | diff2 | blob | history
drivers/macintosh/Kconfig diff1 | diff2 | blob | history
drivers/usb/input/hid-core.c diff1 | diff2 | blob | history
drivers/usb/input/hid-input.c diff1 | diff2 | blob | history
drivers/usb/input/hid.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.