David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-01 14:53:27 -04: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	virtio: unify config_changed handling	2014-10-15 10:24:54 +10:30
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