David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
appldata	[S390] pm: appldata power management callbacks	2009-06-16 10:31:15 +02:00
boot
crypto	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2009-03-26 16:04:22 -07:00
hypfs	[S390] fix hypfs build failure	2009-03-31 19:17:03 +02:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
kernel	[S390] kernel: Storing machine flags early in lowcore	2009-08-07 10:40:39 +02:00
kvm	Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-08-09 14:58:21 -07:00
lib	[S390] add __ucmpdi2() helper function	2009-07-07 16:37:53 +02:00
math-emu
mm	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
oprofile
power	[S390] hibernation: fix register corruption on machine checks	2009-07-24 12:41:00 +02:00
defconfig	[S390] Update default configuration.	2009-06-22 12:08:25 +02:00
Kconfig	[S390] define KTIME_SCALAR for 32-bit s390	2009-07-07 16:37:54 +02:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	[S390] s390: hibernation support for s390	2009-06-16 10:31:22 +02:00