projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b50f315 c1d10d1)
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)
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 patch | diff1 | diff2 | blob | history
drivers/hid/hid-picolcd.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/hid-picolcd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.