Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:33:42 +0000 (11:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:35:11 +0000 (11:35 +0200)
commit99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc
tree9dbe8427ee72d1aa2fce24a53df2723c3745e2be
parent56ccd186f1837dd418cd094f0e96b3196bbab9ef
parent44d27f7dfedd9aadc082cda31462f6600f56e4ec
parent4e52b538e31d8eca2dde1f01e0685977c19d006e
parented13794925786a64b2a21389d40a09e4012c357d
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-logitech-dj.c