Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...
commitef77ad5e67447b3744574c29b97da6677d6d3f18
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:05:06 +0000 (19 14:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:05:06 +0000 (19 14:05 +0200)
tree6eea09e0ca802da6c4236155b30e7a5c38c2b436
parent7426ef52b42ebd54ba85133ffd29132e008a882c
parent23d021167eebf0df5ccadf4f8de5ccb8d4ac2904
parentda54a0ced4502dc2a25df034f218463a2a50488d
parentf77e347bd44e3640bdc56003b7402c63ddb1241d
parent6a740aa4f47b9f29bad5292cf51f008f3edad9b1
Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus
drivers/hid/hid-core.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-core.c
include/linux/hid.h