David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
core-card.c
core-cdev.c
core-device.c
core-iso.c
core-topology.c
core-transaction.c	firewire: core: use correct vendor/model IDs	2015-02-02 21:56:03 +01:00
core.h
init_ohci1394_dma.c
Kconfig
Makefile
net.c	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
nosy-user.h
nosy.c
nosy.h
ohci.c
ohci.h
sbp2.c