David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
block	Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block	2014-10-18 12:12:45 -07:00
char	s390/hmcdrv: Restrict s390 HMC driver to S390 arch	2014-10-15 16:56:26 +02:00
cio	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
crypto	s390/zcrypt: Toleration of new crypto hardware	2014-10-09 09:14:05 +02:00
kvm	KVM: s390: virtio_ccw: remove unused variable	2014-11-03 10:43:00 +01:00
net	ctcm: replace sscanf by kstrto function	2014-10-26 22:21:40 -04:00
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-08-07 08:41:00 -07:00
Makefile