Marek Szyprowski f7d8f1e9cb Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next ... Conflicts: mm/Kconfig Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>		2013-07-15 11:13:54 +02:00
..
asm	Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next	2013-07-15 11:13:54 +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