author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
Fri, 28 Jun 2013 06:00:25 +0000 (23:00 -0700) | ||
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
Fri, 28 Jun 2013 06:00:25 +0000 (23:00 -0700) |
Pull in changes from Henrik: "a trivial MT documentation fix".
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-mmp/aspenite.c | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-mmp/teton_bga.c | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/omap4-keypad.c | patch | | diff1 | | diff2 | | blob | history |
drivers/input/misc/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/touchscreen/egalax_ts.c | patch | | diff1 | | diff2 | | blob | history |
drivers/tty/sysrq.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge
diff --cc arch/arm/mach-mmp/teton_bga.c
Simple merge
diff --cc drivers/input/keyboard/Kconfig
Simple merge
diff --cc drivers/input/keyboard/Makefile
Simple merge
diff --cc drivers/input/keyboard/omap4-keypad.c
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/touchscreen/egalax_ts.c
Simple merge
diff --cc drivers/tty/sysrq.c
Simple merge