2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/arch/ia64
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08: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 Merge branch 'acpica' into release 2009-09-19 01:45:22 -04:00
ia32 const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
include/asm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
kernel Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
kvm KVM: Reduce runnability interface with arch support code 2009-09-10 08:33:13 +03:00
lib [IA64] fix csum_ipv6_magic() 2009-09-02 09:14:48 -07:00
mm [IA64] Re-implement spinaphores using ticket lock concepts 2009-10-09 10:52:39 -07:00
oprofile [IA64] implement ticket locks for Itanium 2009-09-25 08:42:16 -07:00
pci [IA64] Require SAL 3.2 in order to do extended config space ops 2009-10-13 10:44:42 -07:00
scripts ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization 2009-03-26 10:50:09 -07:00
sn [IA64] use printk_once() unaligned.c/io_common.c 2009-10-13 12:48:25 -07:00
uv [IA64] Simplify SGI uv vs. sn2 driver issues 2008-11-04 11:29:39 -08:00
xen rcu: Simplify rcu_pending()/rcu_check_callbacks() API 2009-08-23 10:32:39 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig [IA64] implement ticket locks for Itanium 2009-09-25 08:42:16 -07:00
Kconfig.debug [PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu 2005-11-07 07:53:35 -08:00
Makefile arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build 2009-08-11 14:52:11 -07:00
module.lds