diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-13 00:58:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-13 00:58:28 +0100 |
| commit | 9f6d98c298d48eec29a32ae8ed6f4d896eb4f634 (patch) | |
| tree | 24a21ecbd80cd737ce0a4a21591340e6d7f51964 /net/mac802154/rx.c | |
| parent | net: fec_mpc52xx: Read MAC address from device-tree (diff) | |
| parent | htb: fix values in opt dump (diff) | |
| download | linux-9f6d98c298d48eec29a32ae8ed6f4d896eb4f634.tar.xz linux-9f6d98c298d48eec29a32ae8ed6f4d896eb4f634.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question. Thus, use the 'net-next' version.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/rx.c')
0 files changed, 0 insertions, 0 deletions