Merge branch 'hid-suspend' into picolcd
authorJiri Kosina <jkosina@suse.cz>
Mon, 3 May 2010 13:25:35 +0000 (15:25 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 3 May 2010 13:25:35 +0000 (15:25 +0200)
commitd6d53cbc6b10d28646fb6184d1069f336ec76dc4
tree1c844b3ce8bd430becbbb74875898b08d9f89bb5
parent0b5adf92ec793c665b0de63ac146d190a921c391
parent6a740aa4f47b9f29bad5292cf51f008f3edad9b1
Merge branch 'hid-suspend' into picolcd
drivers/hid/usbhid/hid-core.c