Merge tag 'v3.12'
authorEric Paris <eparis@redhat.com>
Fri, 22 Nov 2013 23:57:08 +0000 (18:57 -0500)
committerEric Paris <eparis@redhat.com>
Fri, 22 Nov 2013 23:57:54 +0000 (18:57 -0500)
Linux 3.12

Conflicts:
fs/exec.c


Trivial merge