tree 0ebdbddc97d3abbc675916010e7771065b70c137
parent 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9
parent 6447f55da90b77faec1697d499ed7986bb4f6de6
author Len Brown <len.brown@intel.com> 1300862094 -0400
committer Len Brown <len.brown@intel.com> 1300862094 -0400

Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>