diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:45:52 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:45:52 +0100 |
| commit | 0d69a3c731e120b05b7da9fb976830475a3fbc01 (patch) | |
| tree | f53647d8800028f27e37a60d227e35c0894be6c4 /drivers/crypto/hifn_795x.c | |
| parent | Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'fo... (diff) | |
| parent | HID: clean up quirk for Sony RF receivers (diff) | |
| parent | HID: steelseries: fix out of bound array access (diff) | |
| download | linux-0d69a3c731e120b05b7da9fb976830475a3fbc01.tar.xz linux-0d69a3c731e120b05b7da9fb976830475a3fbc01.zip | |
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
Conflicts:
drivers/hid/hid-core.c