Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:04:24 +0000 (08:04 -0700)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:05:17 +0000 (08:05 -0700)
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.

1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge