From: Eric Paris <eparis@redhat.com>
Date: Fri, 22 Nov 2013 23:57:08 +0000 (-0500)
Subject: Merge tag 'v3.12'
X-Git-Tag: v3.14-rc1~118^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc582aef7dcc27a7120cf232c1e76c569c7b6eab;p=pandora-kernel.git

Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c
---

fc582aef7dcc27a7120cf232c1e76c569c7b6eab
Reading git-diff-tree failed