linux_dsm_epyc7002/drivers/s390
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
block s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
char s390/3215: partially revert tty close handling fix 2013-01-08 10:57:08 +01:00
cio s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
crypto s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
kvm s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
scsi [SCSI] zfcp: only access zfcp_scsi_dev for valid scsi_device 2012-09-24 12:11:02 +04:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00