diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:11:09 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:11:09 +0200 |
| commit | 3ae821effdfea47dcb36b52e0a8dffd9757a96a6 (patch) | |
| tree | 34e5c8bc7d35c3727d9f029e5bd6205333bddbc9 /include/linux/hid.h | |
| parent | Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus (diff) | |
| download | linux-dev-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.tar.xz linux-dev-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.zip | |
HID: sony: fix force feedback mismerge
Fix unfortunate mismerge between the fixes and sony branch causing
code duplication and unterminated basic block.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/hid.h')
0 files changed, 0 insertions, 0 deletions