Merge commit 'v3.2-rc6' into x86/platform
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
1  2 
arch/x86/Kconfig
arch/x86/platform/mrst/mrst.c

Simple merge
Simple merge