curl: Fixup line ending merge issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 24 Nov 2014 16:23:16 +0000 (16:23 +0000)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 17:18:41 +0000 (09:18 -0800)
commitd6b43c1d5d2f750872e1c5762ae38f8cd224612e
tree0393eaf5c14df138e6e672d6e0d8c5fadf1af080
parent53ad6bafeb01ee8141166ef1d7a958754f456f9c
curl: Fixup line ending merge issues

Somehow the patch line endings got messed up during merge. This restores
the delta.

(From OE-Core rev: 5dee4e241d64e6144d74967cca583d249689773a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta/recipes-support/curl/curl/CVE-2014-3613.patch
meta/recipes-support/curl/curl/CVE-2014-3620.patch