err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4bdbd28 c997679)

author	Dmitry Torokhov <dtor@insightbb.com>
	Fri, 8 Dec 2006 06:07:56 +0000 (01:07 -0500)
committer	Dmitry Torokhov <dtor@insightbb.com>
	Fri, 8 Dec 2006 06:07:56 +0000 (01:07 -0500)
commit	bef986502fa398b1785a3979b1aa17cd902d3527
tree	b59c1afe7b1dfcc001b86e54863f550d7ddc8c34	tree \| snapshot
parent	4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c	commit \| diff
parent	c99767974ebd2a719d849fdeaaa1674456f5283f	commit \| 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

Linux 2.6 source tree