git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7e48c10
cc2df20
)
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
author
Alexander Graf
<agraf@suse.de>
Wed, 28 Aug 2013 22:41:59 +0000
(
00:41
+0200)
committer
Alexander Graf
<agraf@suse.de>
Wed, 28 Aug 2013 22:41:59 +0000
(
00:41
+0200)
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff