David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c		2010-05-12 00:05:35 -07:00
..
alpha	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
avr32	arch/avr32: fix build failure caused by wrong prototype	2010-04-27 16:26:03 -07:00
blackfin	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cris	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
frv	frv: fix kernel/user segment handling in NOMMU mode	2010-04-07 08:38:05 -07:00
h8300	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ia64	KVM: fix the handling of dirty bitmaps to avoid overflows	2010-04-20 13:06:55 +03:00
m32r	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
m68k	m68knommu: fix coldfire tcdrain	2010-04-21 13:43:06 +10:00
m68knommu	m68knommu: remove a duplicate vector setting line for 68360	2010-04-21 13:43:06 +10:00
microblaze	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
mips	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
mn10300	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
parisc	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
powerpc	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2010-04-29 20:01:42 -07:00
s390	[S390] vdso: use ntp adjusted clock multiplier	2010-04-22 17:17:19 +02:00
score	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sh	sh: sh7751 pci controller io port fix	2010-04-26 16:02:25 +09:00
sparc	sparc64: Fix hardirq tracing in trap return path.	2010-04-20 00:48:37 -07:00
um	uml: Fix build breakage after slab.h changes	2010-04-19 17:46:23 +09:00
x86	kprobes/x86: Fix removed int3 checking order	2010-05-11 09:14:25 +02:00
xtensa	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
.gitignore	…
Kconfig	Merge branch 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-05 10:50:22 -08:00