David S. Miller e548833df8 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/mac80211/main.c		2010-09-09 22:27:33 -07:00
..
block	[S390] dasd: fix format string types	2010-08-13 10:06:54 +02:00
char	Input: sysrq - drop tty argument form handle_sysrq()	2010-08-21 00:34:45 -07:00
cio	qdio: extend API to allow polling	2010-09-08 14:31:00 -07:00
crypto	[S390] avoid default_llseek in s390 drivers	2010-05-17 10:00:16 +02:00
kvm	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
net	qeth: NAPI support for l2 and l3 discipline	2010-09-08 14:31:02 -07:00
scsi	qdio: extend API to allow polling	2010-09-08 14:31:00 -07:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00