]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:51:31 +0000 (13:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:51:35 +0000 (13:51 +0200)
commitde66ee979d0ea45171cc2501750e9f9f22f5a690
tree5ab1a5c6b596b9b786902fb380274e1e1f4ceb13
parent916f676f8dc016103f983c7ec54c18ecdbb6e349
parent4db70f73e56961b9bcdfd0c36c62847a18b7dbb5
Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/setup.c