Merge branch 'linus'
commit07354617fa7930b992b57ba18dafd3fa5eeb6c9b
authorIngo Molnar <mingo@elte.hu>
Wed, 25 May 2011 07:28:18 +0000 (25 09:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 May 2011 07:28:18 +0000 (25 09:28 +0200)
tree24e6fddd3fd7f27c447c8910c0ed489ca8b10c70
parentcba6eaca1e0f44adfa5cd6ead4f5e737ec99b399
parent4a7df24ddc7097cd789a7527187826552ea0765e
Merge branch 'linus'
arch/x86/kernel/vmlinux.lds.S
drivers/i2c/busses/Kconfig
drivers/platform/x86/Kconfig