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)

Trivial merge