David Howells 5c55b40b27 FRV: Fix interaction with new generic header stuff ... Fix interaction with new generic header stuff as added by: commit 6103ec56c6 Author: Arnd Bergmann <arnd@arndb.de> Date: Wed May 13 22:56:27 2009 +0000 asm-generic: add generic ABI headers The problem is that asm/signal.h has been made to include asm-generic/signal.h, but the redundant stuff from asm/signal.h has not been discarded, leading to multiple redefinitions. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-06-13 13:17:28 -07:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
frv	FRV: Fix interaction with new generic header stuff	2009-06-13 13:17:28 -07:00
h8300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
m68knommu	module: cleanup FIXME comments about trimming exception table entries.	2009-06-12 21:47:05 +09:30
microblaze	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2009-06-12 18:18:05 -07:00
sh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
sparc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
x86	Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-13 13:14:51 -07:00
xtensa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2009-06-12 18:15:51 -07:00
.gitignore
Kconfig