diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 10:17:26 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 10:17:26 +0300 |
| commit | 035f901eac4d2d0fd40f3055026355d55d46949f (patch) | |
| tree | 26e818b4365af13540927e3e44916cf228d1262c /net/xfrm/xfrm_user.c | |
| parent | bcf741cb779283081db47853264cc94854e7ad83 (diff) | |
| parent | 019d62db54017f4639fd7d4f6592f5a116a16695 (diff) | |
| download | linux-035f901eac4d2d0fd40f3055026355d55d46949f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in fixes for the next merge window.
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions