tree b59c1afe7b1dfcc001b86e54863f550d7ddc8c34
parent 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c
parent c99767974ebd2a719d849fdeaaa1674456f5283f
author Dmitry Torokhov <dtor@insightbb.com> 1165558076 -0500
committer Dmitry Torokhov <dtor@insightbb.com> 1165558076 -0500

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h