]> 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, 19 Sep 2013 01:29:14 +0000 (11:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 01:29:14 +0000 (11:29 +1000)
commit6ddc0c66ec9ced4187b04ad1e9becf87d292e773
tree8384a1536f05681628ee68c1a6f1807a3a3a8b51
parent0f28daf4dd2fee92c4681035d935bc49c696c010
parentaba8269588301f7778bea811d6f7ec74c2e37279
Merge remote-tracking branch 'ipsec-next/master'

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