David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

block

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

char

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

cio

[S390] css: fix rsid evaluation for 2nd crw

2010-12-01 10:08:17 +01:00

crypto

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

kvm

[S390] cleanup lowcore access from external interrupts

2010-10-25 16:10:19 +02:00

net

qeth: buffer count imbalance

2010-12-10 14:28:48 -08:00

scsi

[SCSI] zfcp: Issue FCP command without holding SCSI host_lock

2010-12-09 09:41:23 -06:00

Makefile

[S390] split/move machine check handler code

2009-03-26 15:24:10 +01:00