Miklos Szeredi f3c072ad72 uml: fix compile error in dma_get_cache_alignment() ... Fix uml compile error: include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment' arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here Introduced by commit 4565f0170d ("dma-mapping: unify dma_get_cache_alignment implementations") Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: Jeff Dike <jdike@addtoit.com> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2010-08-20 09:34:55 -07:00
..
alpha	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
arm	s5pc110: SDHCI-s3c can override host capabilities	2010-08-20 09:34:55 -07:00
avr32	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
blackfin	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
cris	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
frv	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
h8300	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
ia64	[IA64] Fix build error: conflicting types for ‘sys_execve’	2010-08-18 10:17:44 -07:00
m32r	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2010-08-18 09:27:10 -07:00
m68knommu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2010-08-18 09:27:10 -07:00
microblaze	Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-18 09:26:17 -07:00
mips	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
mn10300	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
parisc	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
powerpc	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
s390	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
score	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
sh	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-08-17 18:14:08 -07:00
tile	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
um	uml: fix compile error in dma_get_cache_alignment()	2010-08-20 09:34:55 -07:00
x86	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-19 09:06:49 -07:00
xtensa	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
.gitignore
Kconfig	Merge branch 'perf/nmi' into perf/core	2010-08-05 08:45:05 +02:00