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)
commit66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e
tree28ebaaee56786cd9199e0e5802d166474d30d1e3
parent8db089d1b08209c04cd130e49fa4796b5513ce7f
parentd37e44969e60dc652fdbaf4397d5436e07c967af
Merge branch 'master' into upstream

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
drivers/hid/hid-core.c
drivers/hid/hid-ids.h