diff options
| author | David S. Miller | 2012-04-24 05:14:36 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-04-24 05:15:17 +0200 |
| commit | f24001941c99776f41bd3f09c07d91205c2ad9d4 (patch) | |
| tree | 0ab31480ccdf343b61db045e195d096068ef7c73 /drivers/net/xen-netback | |
| parent | net: Use bool and remove inline in skb_splice_bits() code. (diff) | |
| parent | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar... (diff) | |
| download | kernel-qcow2-linux-f24001941c99776f41bd3f09c07d91205c2ad9d4.tar.gz kernel-qcow2-linux-f24001941c99776f41bd3f09c07d91205c2ad9d4.tar.xz kernel-qcow2-linux-f24001941c99776f41bd3f09c07d91205c2ad9d4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")
The former moved around the sysctl register/unregister calls, the
later simply removed them.
With help from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback')
0 files changed, 0 insertions, 0 deletions