Merge branch 'for-3.15/ll-driver-new-callbacks' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 16:56:24 +0000 (18:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 16:56:24 +0000 (18:56 +0200)
1  2 
net/bluetooth/hidp/core.c

Simple merge