summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-07-04 15:05:02 +0200
committerJiri Kosina <jkosina@suse.cz>2013-07-04 15:05:02 +0200
commit21796b39c9e876a46a353a4a9ff9881766a7c176 (patch)
tree119e93184ba04e6cee5798cfd28686100899db1e /net/bluetooth
parent08ec2dcc3527a20c619aca2fb36f800908256bac (diff)
parent9d157624035214793c6d06b0512c6ab1a7b39e05 (diff)
parentb8e0fe31a7c8623741f91bc27f925220341fdf81 (diff)
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus