diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:44:36 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:44:36 +0200 |
commit | c3d9d74336c10c133ed062a1d778d457c6a46422 (patch) | |
tree | 3763bf5b68feca1088c5a87c6bdb23b14c42b736 | |
parent | Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | HID: hid-sony: override usbhid_output_raw_report for Sixaxis (diff) | |
parent | HID: hidraw: fix window in hidraw_release (diff) | |
download | linux-c3d9d74336c10c133ed062a1d778d457c6a46422.tar.xz linux-c3d9d74336c10c133ed062a1d778d457c6a46422.zip |
Merge branches 'upstream' and 'upstream-fixes' into for-linus