projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5705b8a
67bf12c
)
Merge branch 'next' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 2 Jul 2013 16:01:31 +0000
(09:01 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 2 Jul 2013 16:01:31 +0000
(09:01 -0700)
Prepare first set of updates for 3.11 merge window.
1
2
arch/arm/mach-davinci/board-da850-evm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/keyboard/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/keyboard/samsung-keypad.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/serio/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/cyttsp_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/cyttsp_core.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-davinci/board-da850-evm.c
Simple merge
diff --cc
drivers/input/keyboard/Kconfig
Simple merge
diff --cc
drivers/input/keyboard/samsung-keypad.c
Simple merge
diff --cc
drivers/input/serio/Kconfig
Simple merge
diff --cc
drivers/input/touchscreen/cyttsp_core.c
Simple merge
diff --cc
drivers/input/touchscreen/cyttsp_core.h
Simple merge