diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-23 23:14:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-23 23:15:17 -0400 |
| commit | 4c0e3c14106e037f010d16ad150c86f9a9841deb (patch) | |
| tree | dc583a339b36328e3e8aadc097fa22b4097b5178 /crypto/xor.c | |
| parent | b0b7944f432a1a669462e395ffd4491e4fed7367 (diff) | |
| parent | acdc6cb9a4bec57e322dacb623758765d85e7324 (diff) | |
| download | linux-crypto-4c0e3c14106e037f010d16ad150c86f9a9841deb.tar.gz linux-crypto-4c0e3c14106e037f010d16ad150c86f9a9841deb.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 'crypto/xor.c')
0 files changed, 0 insertions, 0 deletions