summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_user.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-03-02 23:04:01 +0100
committerGreg Kroah-Hartman2014-03-02 23:04:01 +0100
commit9f4a9b83f13544df61efd3645308f64205dc8db9 (patch)
treed51816466e7a62e147c08a7ea7b9f3df1df6cad0 /net/xfrm/xfrm_user.c
parentMerge tag 'fixes-for-3.14d' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentMerge 3.14-rc4 into char-misc-linus (diff)
downloadkernel-qcow2-linux-9f4a9b83f13544df61efd3645308f64205dc8db9.tar.gz
kernel-qcow2-linux-9f4a9b83f13544df61efd3645308f64205dc8db9.tar.xz
kernel-qcow2-linux-9f4a9b83f13544df61efd3645308f64205dc8db9.zip
Merge iio fixes into staging-linus
These I forgot about before, but need to get into 3.14-final. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions