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:
c0f72d7
)
ARM: tegra: fix mismerges of header file inclusions
author
Olof Johansson
<olof@lixom.net>
Sat, 22 Sep 2012 18:08:03 +0000
(11:08 -0700)
committer
Olof Johansson
<olof@lixom.net>
Sun, 7 Oct 2012 14:02:06 +0000
(07:02 -0700)
Another mishandled merge conflict by me, where the header file renames
and the removal of gpio includes clashed and I chose the wrong end result.
Fixes build breakage for tegra_defconfig.
Signed-off-by: Olof Johansson <olof@lixom.net>
No differences found
git.openpandora.org / pandora-kernel.git / commitdiff