Merge tag 'v3.7-rc5' into execve
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 13 Nov 2012 17:36:07 +0000 (17:36 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 13 Nov 2012 17:36:07 +0000 (17:36 +0000)
Linux 3.7-rc5

Conflicts:
arch/arm64/kernel/process.c


Trivial merge