refs/heads/for-x86-mm-test - pub/scm/linux/kernel/git/yinghai/linux-yinghai - Git at Google

commit: fabbcf1a2cbe1ed95a7de888da476546a93ba47c
[log]
author: Yinghai Lu <yinghai@kernel.org>
Tue Oct 30 07:37:40 2012 -0700
committer: Yinghai Lu <yinghai@kernel.org>
Tue Oct 30 07:37:40 2012 -0700
tree: 6c9b34466dcc672804c878cec9824025ba949908
parent: 35fd3dc58da675d659513384221349ef90749a01 [diff]
parent: ce2f16be2db414dc048bc78110c5d2cfe87259a5 [diff]

Merge branch 'for-x86-mm' into for-x86-mm-test
with 3.7-rc3
Conflicts:
	arch/x86/kernel/setup.c
	arch/x86/mm/init.c
	arch/x86/platform/efi/efi.c

tree: 6c9b34466dcc672804c878cec9824025ba949908