diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-03-31 16:56:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-31 16:56:43 -0400 |
| commit | 0b70195e0c3206103be991e196c26fcf168d0334 (patch) | |
| tree | 61902c09bfa14034a82c151f46a4616a2f013653 /Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (diff) | |
| parent | at86rf230: mask irq's before deregister device (diff) | |
| download | linux-dev-0b70195e0c3206103be991e196c26fcf168d0334.tar.xz linux-dev-0b70195e0c3206103be991e196c26fcf168d0334.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/xen-netback/netback.c
A bug fix overlapped with changing how the netback SKB control
block is implemented.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt')
0 files changed, 0 insertions, 0 deletions