Merge branch 'alarm' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:36:32 +0000 (03:36 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:36:32 +0000 (03:36 -0500)
commit38f64c771bece2cdbd72ed733e6fc8f2e279a7c1
tree3fdfcfe4cefde7756a6f4e525271c76d41efb853
parente2f7a7772880458edff1b1cc5a988947229fac26
parent2602a671ad7321a25d253c080837e4569a9bceed
Merge branch 'alarm' into release
drivers/acpi/proc.c