]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acrux' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
commit0cd10e92e11a2a2dc640261caf4d935379095fd8
tree1f85aa8bd902aae76beb1c9deb20557a2e71fe9c
parent00220687297983f408211243e50605c33cf81e85
parentd8690bb453818e46b808d3bdb2e37e4a26e23273
Merge branch 'acrux' into for-linus

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h