Merge branch 'suspend' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:46 +0000 (23:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:46 +0000 (23:28 -0400)
commitacd41d36e5a813501da92156f325ce15ddcd58ff
treedaaca230153261b13e6d1989a977352e2c29a3d4
parent4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841
parent4fb507b6b764195bb7821cf2baa988f6eb677d30
Merge branch 'suspend' into test
drivers/acpi/sleep/main.c