Luck, Tony 4313d88c93 xen/ia64: fix build breakage because of conflicting u64 guest handles ... include/xen/interface/xen.h:526: error: conflicting types for ‘__guest_handle_u64’ arch/ia64/include/asm/xen/interface.h:74: error: previous declaration of ‘__guest_handle_u64’ was here Problem introduced by "xen/granttable: Introducing grant table V2 stucture" which added a new definition to include/xen/interface/xen.h for "u64". Fix: delete the ia64 arch specific definition. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>		2011-11-30 13:40:03 -05:00
..
alpha	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
arm	Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh	2011-11-14 06:47:04 -02:00
avr32	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
blackfin	blackfin: Fixup export.h includes	2011-11-14 17:15:23 +08:00
cris	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
frv	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
h8300
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	xen/ia64: fix build breakage because of conflicting u64 guest handles	2011-11-30 13:40:03 -05:00
m32r	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
m68k	m68k/mac: Remove mac_irq_{en,dis}able() wrappers	2011-11-08 22:35:52 +01:00
microblaze	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mips	kbuild: Fix missing system calls check on mips.	2011-11-09 14:37:44 +01:00
mn10300	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
openrisc	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
parisc	parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:00 -04:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-15 14:47:28 -02:00
s390	Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-11-06 20:20:46 -08:00
score
sh	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2011-11-08 12:50:02 -08:00
tile	Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile	2011-11-04 12:33:34 -07:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32	unicore32: EXPORT_SYMBOL needs export.h	2011-10-31 19:31:06 -04:00
x86	xen/granttable: Grant tables V2 implementation	2011-11-22 09:24:51 -05:00
xtensa
.gitignore
Kconfig