linux/drivers/s390
David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-26 21:55:51 -05:00
..
block [S390] dasd: revalidate server for new pathgroup 2012-01-18 18:03:42 +01:00
char [S390] 3215 deadlock with tty_wakeup 2012-02-17 10:29:33 +01:00
cio module_param: avoid bool abuse, add bint for special cases. 2012-01-13 09:32:17 +10:30
crypto [S390] zcrypt: Fix error return codes. 2011-12-27 11:27:13 +01:00
kvm virtio: harsher barriers for rpmsg. 2012-01-12 15:44:42 +10:30
net qeth: add wake_up on write channel 2012-02-08 18:50:20 -05:00
scsi [SCSI] zfcp: return early from slave_destroy if slave_alloc returned early 2011-12-14 15:40:43 +04:00
Makefile