Alexander Graf bf550fc93d Merge remote-tracking branch 'origin/next' into kvm-ppc-next ... Conflicts: mm/Kconfig CMA DMA split and ZSWAP introduction were conflicting, fix up manually.		2013-08-29 00:41:59 +02:00
..
asm	Merge remote-tracking branch 'origin/next' into kvm-ppc-next	2013-08-29 00:41:59 +02:00
debug	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-07-03 09:46:29 -07:00
uapi/asm	Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable	2013-06-18 20:11:32 +01:00