linux/drivers/s390
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
block Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block 2011-11-04 17:06:58 -07:00
char [S390] zfcpdump: Do not initialize zfcpdump in kdump mode 2011-11-14 11:19:09 +01:00
cio Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
crypto [S390] ap: Setup processing for messages in request queue. 2011-11-14 11:19:09 +01:00
kvm enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs 2011-11-16 17:26:46 -05:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
scsi s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00