kernel-fxtec-pro1x/drivers/s390
David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-07 18:37:01 -04:00
..
block s390/scm_blk: fix error return code in scm_blk_init() 2013-03-21 13:35:38 +01:00
char s390/3270: fix minor_start issue 2013-03-21 13:35:39 +01:00
cio s390/scm: process availability 2013-03-07 09:52:24 +01:00
crypto s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
kvm virtio: remove obsolete virtqueue_get_queue_index() 2013-03-22 10:23:34 -04:00
net qeth: Fix scatter-gather regression 2013-03-19 10:09:40 -04:00
scsi s390/time: rename tod clock access functions 2013-02-14 15:55:10 +01:00
Makefile