aboutsummaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-01-23 14:00:16 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-23 14:00:16 -0500
commit93b9c1ddd3fb4a5b67d512e534b30070f9ecec28 (patch)
treef9584c9b3ff6873b2be043ea08c0fbb354c040df /net/can
parent4c133c39ae1bc541b3db5903a680da738a0c57e3 (diff)
parent02bfd8ecf5cf980ede53e30a903b102924fc32f4 (diff)
Merge branch 'testing' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says: ==================== 1) Add a statistic counter for invalid output states and remove a superfluous state valid check, from Li RongQing. 2) Probe for asynchronous block ciphers instead of synchronous block ciphers to make the asynchronous variants available even if no synchronous block ciphers are found, from Jussi Kivilinna. 3) Make rfc3686 asynchronous block cipher and make use of the new asynchronous variant, from Jussi Kivilinna. 4) Replace some rwlocks by rcu, from Cong Wang. 5) Remove some unused defines. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions