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)
commit35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd
tree1f85aa8bd902aae76beb1c9deb20557a2e71fe9c
parent9929ffed889b4861b52ba648a44fa4add945c4d1
parent7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab
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