tree 9dbe8427ee72d1aa2fce24a53df2723c3745e2be
parent 56ccd186f1837dd418cd094f0e96b3196bbab9ef
parent 44d27f7dfedd9aadc082cda31462f6600f56e4ec
parent 4e52b538e31d8eca2dde1f01e0685977c19d006e
parent ed13794925786a64b2a21389d40a09e4012c357d
author Jiri Kosina <jkosina@suse.cz> 1337679222 +0200
committer Jiri Kosina <jkosina@suse.cz> 1337679311 +0200

Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

Conflicts:
	drivers/hid/hid-core.c