summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-05-16 01:59:17 -0400
committerLen Brown <len.brown@intel.com>2009-05-16 01:59:17 -0400
commit9532b3c84be27b25ca6e01da460d72ccf8fa91e3 (patch)
treef5d352c6aa4d71bdb0632734fb4b737754033a8a
parent415aafa752e75cb7a3fed0bbaefc68aa1e03d4b2 (diff)
parent4b9575c04a5fe38d02eeabcad743ed886ebc53a4 (diff)
parent015ad1992afae2af754e84ca440b9861f09f3201 (diff)
Merge branches 'reset-default-acpi-TEST' and 'oqo-wmi-EXPECT-REFRESH' into test