Arnd Bergmann 5b02ee3d21 asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2009-06-12 11:32:58 +02:00
..
configs	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	2009-04-02 19:05:07 -07:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	irq: change ->set_affinity() to return status	2009-04-28 12:21:16 +02:00
ia32	generic compat_sys_ustat	2009-03-27 14:43:57 -04:00
include/asm	asm-generic: merge branch 'master' of torvalds/linux-2.6	2009-06-12 11:32:58 +02:00
kernel	Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-06-11 10:03:30 -07:00
kvm	KVM: use smp_send_reschedule in kvm_vcpu_kick	2009-06-10 11:48:53 +03:00
lib	[IA64] Add Variable Page Size and IA64 Support in Intel IOMMU	2008-10-17 12:14:13 -07:00
mm	[IA64] BUG to BUG_ON changes	2009-04-01 09:50:48 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	[IA64] SN specific version of dma_get_required_mask()	2009-01-15 10:42:16 -08:00
scripts	ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization	2009-03-26 10:50:09 -07:00
sn	irq: change ->set_affinity() to return status	2009-04-28 12:21:16 +02:00
uv	[IA64] Simplify SGI uv vs. sn2 driver issues	2008-11-04 11:29:39 -08:00
xen	[IA64] xen_domu_defconfig: fix build issues/warnings	2009-05-05 11:43:13 -07:00
install.sh
Kconfig	Merge branches 'tracing/ftrace' and 'linus' into tracing/core	2009-02-27 09:04:43 +01:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	Pull vtd-iommu into release branch	2008-10-17 13:52:22 -07:00
module.lds