Ingo Molnar 4c7145a1ec Merge branch 'linus' into x86/spinlocks ... Done to prevent this failure of an Octopus merge: Added arch/arm/include/asm/byteorder.h in both, but differently. ERROR: Merge conflict in arch/arm/include/asm/byteorder.h Auto-merging include/asm-x86/spinlock.h ERROR: Merge conflict in include/asm-x86/spinlock.h fatal: merge program failed		2008-10-12 12:39:50 +02:00
..
acpi
asm-arm
asm-cris
asm-frv
asm-generic	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
asm-m32r
asm-m68k
asm-mips	MIPS: Move headfiles to new location below arch/mips/include	2008-10-11 16:18:52 +01:00
asm-mn10300
asm-parisc
asm-um	net: Fix build with ARCH=um	2008-09-19 12:44:54 -07:00
asm-x86	Merge branch 'linus' into x86/spinlocks	2008-10-12 12:39:50 +02:00
asm-xtensa
crypto
drm
keys
linux	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2008-10-11 13:23:48 -07:00
math-emu
media
mtd
net	net: fix dummy 'nf_conntrack_event_cache()'	2008-10-11 09:46:24 -07:00
pcmcia
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-10-10 10:53:26 -07:00
sound	ALSA: Increase components array size	2008-10-10 13:41:53 +02:00
video	Merge branch 'pxa-all' into devel	2008-10-09 21:33:02 +01:00
xen
Kbuild