diff options
| author | Jiri Kosina <[email protected]> | 2014-04-01 17:11:09 +0000 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2014-04-01 17:11:09 +0000 |
| commit | 3ae821effdfea47dcb36b52e0a8dffd9757a96a6 (patch) | |
| tree | 34e5c8bc7d35c3727d9f029e5bd6205333bddbc9 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' int... (diff) | |
| download | kernel-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions