From: Eric Paris <eparis@redhat.com>
Date: Fri, 7 Mar 2014 16:41:32 +0000 (-0500)
Subject: Merge tag 'v3.13' into for-3.15
X-Git-Tag: v3.15-rc1~18^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7d3622a39fde7658170b7f3cf6c6889bb8db30d;p=pandora-kernel.git

Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
---

b7d3622a39fde7658170b7f3cf6c6889bb8db30d
Reading git-diff-tree failed