diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-16 00:51:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-16 00:51:55 +0200 |
| commit | 7e52b33bd50faa866bc3e6e97e68438bc5e52251 (patch) | |
| tree | 46e68adf23f4f170a0eb5045c33a76234de6cf92 /fs/udf | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| parent | ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ipv6_route (diff) | |
| download | linux-7e52b33bd50faa866bc3e6e97e68438bc5e52251.tar.xz linux-7e52b33bd50faa866bc3e6e97e68438bc5e52251.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv6/route.c
This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/udf')
0 files changed, 0 insertions, 0 deletions