]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4b67ab9e67c52ef3819f732d84bf596b2752a6b2
treef2f77cc31b4548745778fca6a51b09e1d8a49804
parent3b2bf7486dd8d5ef3038828722b2151860c110eb
parent2103d8b9368b16b4b294bfed10255d4fe2c81cd7
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