diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /include/net | |
| parent | 92ff71b8fe9cd9c673615fc6f3870af7376d7c84 (diff) | |
| parent | d8b0426af5b67973585712c9af36b86f6ea97815 (diff) | |
| download | linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inetpeer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 823ec7bb9c67..01d590ee5e7e 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h @@ -171,5 +171,4 @@ static inline void inet_peer_refcheck(const struct inet_peer *p) { WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0); } - #endif /* _NET_INETPEER_H */ |