Pankaj Dubey ac525f59fb arm64: fix build error if DMA_CMA is enabled ... arm64/include/asm/dma-contiguous.h is trying to include <asm-genric/dma-contiguous.h> which does not exist, and thus failing build for arm64 if we enable CONFIG_DMA_CMA. This patch fixes build error by removing unwanted header inclusion from arm64's dma-contiguous.h. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Somraj Mani <somraj.mani@samsung.com> Acked-by: Laura Abbott <lauraa@codeaurora.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>		2014-01-27 12:00:25 +00:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha	2013-11-20 15:03:45 -08:00
arc	ARC: [perf] Fix a few thinkos	2013-11-28 15:49:59 +05:30
arm	arm: kvm: implement CPU PM notifier	2013-12-16 17:17:33 +00:00
arm64	arm64: fix build error if DMA_CMA is enabled	2014-01-27 12:00:25 +00:00
avr32	avr32: favr-32: clk_round_rate() can return a zero upon error	2013-12-10 08:46:38 +01:00
blackfin	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
c6x	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
cris	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
frv	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
hexagon	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-11-20 14:25:39 -08:00
m32r	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
m68k	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
metag	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
microblaze	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mips	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mn10300	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
openrisc	OpenRISC updates for 3.13	2013-11-15 14:26:38 -08:00
parisc	parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver	2013-12-03 23:23:35 +01:00
powerpc	powerpc: Fix up the kdump base cap to 128M	2013-12-10 11:28:39 +11:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2013-12-10 11:02:33 -08:00
score	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sh	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2013-11-19 15:50:03 -08:00
tile	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
um	um: Build always with -mcmodel=large on 64bit	2013-12-01 13:06:51 +01:00
unicore32	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
x86	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-15 11:52:47 -08:00
xtensa	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
.gitignore
Kconfig	kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS	2013-11-15 09:32:22 +09:00