git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dce5c9e
)
ARM: 7929/1: Remove duplicate SCHED_HRTICK config option
author
Axel Lin
<axel.lin@gmail.com>
Wed, 18 Dec 2013 03:26:52 +0000
(
04:26
+0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 29 Dec 2013 12:46:51 +0000
(12:46 +0000)
There are two SCHED_HRTICK config entries in Kconfig.
This looks like a merge mistake. Fix it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
patch
|
blob
|
history
diff --cc
arch/arm/Kconfig
Simple merge