summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-10-23 22:44:36 +0200
committerJiri Kosina <jkosina@suse.cz>2010-10-23 22:44:36 +0200
commitc3d9d74336c10c133ed062a1d778d457c6a46422 (patch)
tree3763bf5b68feca1088c5a87c6bdb23b14c42b736
parentMerge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block (diff)
parentHID: hid-sony: override usbhid_output_raw_report for Sixaxis (diff)
parentHID: hidraw: fix window in hidraw_release (diff)
downloadlinux-c3d9d74336c10c133ed062a1d778d457c6a46422.tar.xz
linux-c3d9d74336c10c133ed062a1d778d457c6a46422.zip
Merge branches 'upstream' and 'upstream-fixes' into for-linus