David S. Miller 87eb367003 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-6000.c net/core/dev.c		2010-04-21 01:14:25 -07:00
..
alpha
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-21 01:14:25 -07:00
avr32
blackfin
cris
frv	frv: fix kernel/user segment handling in NOMMU mode	2010-04-07 08:38:05 -07:00
h8300
ia64
m32r
m68k	m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()	2010-04-14 19:45:37 +02:00
m68knommu
microblaze	Add non-Virtex5 support for LL TEMAC driver	2010-04-13 01:33:44 -07:00
mips	MIPS: Calculate proper ebase value for 64-bit kernels	2010-04-12 17:26:22 +01:00
mn10300
parisc
powerpc	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
s390	[S390] Update default configuration.	2010-04-09 13:43:02 +02:00
score
sh	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
sparc	sparc64: Fix hardirq tracing in trap return path.	2010-04-20 00:48:37 -07:00
um
x86	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-04-20 09:20:23 -07:00
xtensa
.gitignore
Kconfig