]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:23:45 +0000 (11:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 01:23:45 +0000 (11:23 +1000)
commit86ab8ea2cf17301eba9890829982f73fe2298094
tree995b7e9a0ab2c66b193ec256d578ca2844057ff1
parentf9aa041a66e15077e8c96404ca8a75169a2748f2
parentaba8269588301f7778bea811d6f7ec74c2e37279
Merge remote-tracking branch 'ipsec-next/master'

Conflicts:
include/net/xfrm.h
include/net/xfrm.h
net/xfrm/xfrm_state.c