Merge branch 'master' into upstream.
Jiri Kosina [Wed, 18 May 2011 15:06:31 +0000 (17:06 +0200)]
This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.

1  2 
Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
drivers/hid/hid-picolcd.c

Simple merge