David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c		2011-06-20 22:29:08 -07:00
..
amiga	m68k/amiga: Reclaim Chip RAM for PPC exception handlers	2011-03-16 19:10:40 +01:00
apollo	…
atari	input/atari: Use the correct mouse interrupt hook	2011-05-19 18:19:11 +02:00
bvme6000	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
configs	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
emu	net/m68k: Include <linux/interrupt.h> where needed	2011-06-11 14:58:17 -07:00
fpsp040	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp300	m68k: hp300 - Checkpatch cleanup	2010-05-17 21:15:40 +02:00
ifpsp060	Fix common misspellings	2011-03-31 11:26:23 -03:00
include/asm	Merge branch 'setns'	2011-05-28 10:51:01 -07:00
kernel	m68k: use kernel processor defines for conditional optimizations	2011-06-14 11:42:29 +10:00
lib	m68k: use kernel processor defines for conditional optimizations	2011-06-14 11:42:29 +10:00
mac	fix comment typos concerning "consistent"	2010-12-10 16:04:28 +01:00
math-emu	m68k: Makefiles - Change to new flags variables	2011-03-16 19:10:41 +01:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
mvme16x	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
mvme147	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
platform	m68knommu: Remove obsolete #include <linux/sys.h>	2011-05-24 15:17:19 +10:00
q40	Fix common misspellings	2011-03-31 11:26:23 -03:00
sun3	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
sun3x	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
tools/amiga	…
Kconfig	m68knommu: Use generic show_interrupts()	2011-05-24 15:17:23 +10:00
Kconfig.debug	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
Kconfig.mmu	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
Kconfig.nommu	m68knommu: create config options for CPU classes	2011-06-14 11:42:29 +10:00
Makefile	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
Makefile_mm	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
Makefile_no	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
install.sh	…