diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-10 23:56:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-10 23:56:33 -0700 |
| commit | 04c9f416e371cff076a8b3279fb213628915d059 (patch) | |
| tree | 2b64cb835cbc9d19d2d06f1e7618615d40ada0af /net/sched/act_nat.c | |
| parent | c278fa53c123282f753b2264fc62c0e9502a32fa (diff) | |
| parent | c1f5163de417dab01fa9daaf09a74bbb19303f3c (diff) | |
| download | linux-3.10-04c9f416e371cff076a8b3279fb213628915d059.tar.gz linux-3.10-04c9f416e371cff076a8b3279fb213628915d059.tar.bz2 linux-3.10-04c9f416e371cff076a8b3279fb213628915d059.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/batman-adv/bridge_loop_avoidance.c
net/batman-adv/bridge_loop_avoidance.h
net/batman-adv/soft-interface.c
net/mac80211/mlme.c
With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).
The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_nat.c')
0 files changed, 0 insertions, 0 deletions