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	IEEE 1394 (FireWire) subsystem updates post v3.4:	2012-05-24 12:57:47 -07:00
core-cdev.c	firewire: cdev: prevent kernel stack leaking into ioctl arguments	2014-11-14 12:10:13 +01:00
core-device.c	firewire: core: document fw_csr_string's truncation of long strings	2014-12-10 20:53:02 +01:00
core-iso.c	firewire: core: fix multichannel IR with buffers larger than 2 GB	2012-06-17 19:35:26 +02:00
core-topology.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
core-transaction.c	firewire: core: use correct vendor/model IDs	2015-02-02 21:56:03 +01:00
core.h	sound updates for 3.16-rc1	2014-06-04 09:08:25 -07:00
init_ohci1394_dma.c	various: Fix spelling of "asynchronous" in comments.	2012-11-19 14:32:13 +01:00
Kconfig	firewire: IEEE 1394 (FireWire) support should depend on HAS_DMA	2014-07-13 20:53:25 +02:00
Makefile	ieee1394: move init_ohci1394_dma to drivers/firewire/	2010-10-11 14:48:03 +02:00
net.c	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
nosy-user.h
nosy.c	firewire: remove use of __devinitdata	2012-11-28 12:40:42 -08:00
nosy.h
ohci.c	firewire: ohci: Remove unused function	2015-01-22 11:08:52 +01:00
ohci.h	firewire: ohci: fix TI TSB82AA2 regression since 2.6.35	2010-10-17 14:09:12 +02:00
sbp2.c	firewire: sbp2: remove redundant check for bidi command	2015-01-31 15:27:40 +01:00