tree e5a05c7297f997e191c73091934e42e3195c0e40
parent cfa806f059801dbe7e435745eb2e187c8bfe1e7f
parent 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295
author Len Brown <len.brown@intel.com> 1281848791 -0400
committer Len Brown <len.brown@intel.com> 1281848791 -0400

Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

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