Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup
authorJiri Kosina <jkosina@suse.cz>
Fri, 14 Mar 2014 14:30:16 +0000 (15:30 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 14 Mar 2014 14:30:16 +0000 (15:30 +0100)
commit65ab2fc479fa8554e26d6d1726a4ebe6f29a73be
treea90294685f0e2a445397a6d9e7e85ac7949ebf1d
parent866e4797b4e8100f5abcf2bfd3f7843dc40306cd
parentdccf2f65e68d2f5b5e86ae6cf9796cf558694953
Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup
drivers/hid/Kconfig
drivers/hid/hid-sony.c