diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 17:02:26 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 17:02:26 +0400 |
| commit | 08ec2dcc3527a20c619aca2fb36f800908256bac (patch) | |
| tree | b39578fe388ab30ba03d4f1dffa9b7be801262d3 | |
| parent | db58316892a5e9034efe718d4c1630788db7528f (diff) | |
| parent | adb91aef9f9965341a9252bd610b5d828d5c016f (diff) | |
| parent | 078328da5d5dfbd2b1333eb545bd89d6dfa984ef (diff) | |
| parent | 3685c18e17f12438d0a83331c1b6a5b00fade7a1 (diff) | |
| download | linux-08ec2dcc3527a20c619aca2fb36f800908256bac.tar.xz | |
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c