diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-12 23:58:28 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-12 23:58:28 (GMT) |
| commit | 9f6d98c298d48eec29a32ae8ed6f4d896eb4f634 (patch) | |
| tree | 24a21ecbd80cd737ce0a4a21591340e6d7f51964 /net/bluetooth/hci_sysfs.c | |
| parent | db98f081888cbdd995c7c4cfd407781da35e33ba (diff) | |
| parent | 9c10f4115cc3722635d6e277385ec96003281784 (diff) | |
| download | linux-fsl-qoriq-9f6d98c298d48eec29a32ae8ed6f4d896eb4f634.tar.xz | |
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/bluetooth/hci_sysfs.c')
0 files changed, 0 insertions, 0 deletions