Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and...
authorJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000 (10:42 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000 (10:42 +0100)
commit539cf54bdd922474d22585837c9fec3343d7061b
treeb91e4ca6d5dc682152f82cc1f645faf5b526ebe8
parentbefde0226a595d1a7854c0cbf32904b8279c4fd0
parent0d1e4b024f5eff6f3a8927ddfbf6a1a9d6db1a31
parent0f690ccf56d3166e695ad27fb0936af189250ef1
parent92241e67c0acf21421cda214bdf877c8c030e556
Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus

Conflicts:
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/i2c-hid/i2c-hid.c