git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43872fa
0cdc8b9
)
Merge branch 'depends/rmk/memory_h' into next/fixes
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:11:46 +0000
(23:11 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 23:25:01 +0000
(
00:25
+0100)
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff