]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 10 Feb 2016 10:32:34 +0000 (11:32 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 10 Feb 2016 10:32:34 +0000 (11:32 +0100)
commitbc1db4af59b20c2a574d0f945a5a157b8d04e06c
tree8b6f9ee2e8e4745a74e20bdd7b93f1563b226e91
parent0f25a4f8ac31406e0776b7ac6d90df02e99cba1b
parent1adf904e90059a5b577dbf49b57c27da29b1e69e
parentbfb61abfc860c5a64be6be7f7277655d4d36a129
Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next
drivers/hid/hid-sony.c