summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-04-01 19:11:09 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-01 19:11:09 +0200
commit3ae821effdfea47dcb36b52e0a8dffd9757a96a6 (patch)
tree34e5c8bc7d35c3727d9f029e5bd6205333bddbc9 /drivers/net/ethernet
parentMerge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' int... (diff)
downloadlinux-3ae821effdfea47dcb36b52e0a8dffd9757a96a6.tar.xz
linux-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 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions