Merge branch 'master' into upstream.
authorJiri Kosina <jkosina@suse.cz>
Wed, 18 May 2011 15:06:31 +0000 (17:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 18 May 2011 15:06:49 +0000 (17:06 +0200)
commit6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a
treef2f77cc31b4548745778fca6a51b09e1d8a49804
parentb50f315cbb865079a16a12fd9ae6083f98fd592c
parentc1d10d18c542278b7fbc413c289d3cb6219da6b3
Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
drivers/hid/hid-picolcd.c