summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:05:06 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:05:06 +0200
commitef77ad5e67447b3744574c29b97da6677d6d3f18 (patch)
tree6eea09e0ca802da6c4236155b30e7a5c38c2b436 /drivers/hid
parent7426ef52b42ebd54ba85133ffd29132e008a882c (diff)
parent23d021167eebf0df5ccadf4f8de5ccb8d4ac2904 (diff)
parentda54a0ced4502dc2a25df034f218463a2a50488d (diff)
parentf77e347bd44e3640bdc56003b7402c63ddb1241d (diff)
parent6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff)
downloadlinux-ef77ad5e67447b3744574c29b97da6677d6d3f18.tar.bz2
Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus