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)
commit6097a07411005c0184cf90256743c784079198fc
tree0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a
parent6a872777ffff6184f4ac10bd71d926d5e6f2491e
parent77b67063bb6bce6d475e910d3b886a606d0d91f7
Merge tag 'v3.7-rc5' into execve

Linux 3.7-rc5

Conflicts:
arch/arm64/kernel/process.c
arch/arm64/Kconfig
arch/arm64/include/asm/processor.h
arch/arm64/include/asm/unistd.h
arch/arm64/kernel/process.c