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)
commitfc582aef7dcc27a7120cf232c1e76c569c7b6eab
tree7d275dd4ceab6067b91e9a25a5f6338b425fbccd
parent9175c9d2aed528800175ef81c90569d00d23f9be
parent5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52
Merge tag 'v3.12'

Linux 3.12

Conflicts:
fs/exec.c
fs/exec.c
fs/namei.c
init/Kconfig
kernel/audit.c