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/hid/hid-sony.c | |
| parent | 73759518d6d6b56e398791b7522328baf4181a82 (diff) | |
| parent | 99d249021abd4341771523ed8dd7946276103432 (diff) | |
| parent | 7e41576247b782a21c05f7ea8a78a6db119ba789 (diff) | |
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
Conflicts:
drivers/hid/hid-core.c