summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 21:11:09 +0400
committerJiri Kosina <jkosina@suse.cz>2014-04-01 21:11:09 +0400
commit3ae821effdfea47dcb36b52e0a8dffd9757a96a6 (patch)
tree34e5c8bc7d35c3727d9f029e5bd6205333bddbc9 /net/bluetooth
parentfa1054a29b21e4c932b5c93def600149451cec32 (diff)
downloadlinux-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.tar.xz
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 'net/bluetooth')
0 files changed, 0 insertions, 0 deletions