projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e571306 012abee)
Merge commit 'v2.6.32-rc5' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2009 06:10:07 +0000 (22:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Nov 2009 06:10:07 +0000 (22:10 -0800)
1  2 
drivers/input/input.c patch | diff1 | diff2 | blob | history
drivers/input/keyboard/atkbd.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/input.c
Simple merge
diff --cc drivers/input/keyboard/atkbd.c
Simple merge
Domain: System / Kernel;