Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:06:59 +0000 (00:06 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:06:59 +0000 (00:06 -0400)
commit71fd68e7d234f6b7d8407c8f486764d24f8411f4
tree6dc2a4c356b4f454fc85d0c7cb019986f6f4993b
parent8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8
parent78f28b7c555359c67c2a0d23f7436e915329421e
Merge branch 'linus' into release
drivers/acpi/scan.c
drivers/acpi/sleep.c