]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea06f4e 5537a05)
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:41:05 +0000 (13:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:41:05 +0000 (13:41 +1100)
Conflicts:
net/xfrm/xfrm_policy.c

1  2 
net/xfrm/xfrm_policy.c patch | diff1 | diff2 | blob | history

diff --cc net/xfrm/xfrm_policy.c
Simple merge
Linux kernel for KaRo TX COM modules