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:
5fae405
)
ARM: S5PC100: Fixup cross tree merge problems
author
Ben Dooks
<ben-linux@fluff.org>
Tue, 25 May 2010 09:19:34 +0000
(18:19 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Wed, 26 May 2010 10:09:50 +0000
(19:09 +0900)
The commit
45c79433c02b8fe7b8a1cbf60548a9798d0502ed
got things building
but then commit
17d2f877ae8b68b09bf88a9949ee64fbbda5ee10
and others
where merged in from a seperate tree and this has resulted from a build
failure due to the redefinition of IRQ_EINT().
Fix this by merging a new commit.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
No differences found