Merge branch 'linus' into out-of-tree
commit831862d6f7a84acccc68b35d04af6ec1571abaa3
authorIngo Molnar <mingo@elte.hu>
Thu, 31 Mar 2011 09:02:23 +0000 (31 11:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 31 Mar 2011 09:02:23 +0000 (31 11:02 +0200)
treec236419a85cdc83c502bfeb9954753183f33f695
parent5b8b799d1aab77d783ba96545e62678268aa64ea
parent6aba74f2791287ec407e0f92487a725a25908067
Merge branch 'linus' into out-of-tree
drivers/platform/x86/Kconfig