kernel

mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00

Files

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

Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

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