Merge branch 'linus' into x86/irq
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:49 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:49 +0000 (12:30 +0200)
commitcbd6712406a3ea861b49fbfd46e23cbf5f8e073f
treeb519cb0f279cd844886df062b3c7ce439912b4ed
parentd939d2851fd12568e2eabb2916769e8a57ba5c89
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/irq
arch/x86/kernel/Makefile