Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 11:45:59 +0000 (13:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Jul 2008 11:45:59 +0000 (13:45 +0200)
commit91d0322bef047e2916b3e52741411bffc63929cb
tree44c4fd13cc17755a6db8a3d70cffb86e57a838dc
parent065cb3dfe24978651caedfa54da585388ad15dde
parent50515af207d410c9f228380e529c56f43c3de0bd
Merge branch 'linus' into x86/urgent
arch/x86/kernel/acpi/sleep.c