tree 35f65ce7d7520b9c4920086382f1838107f836ca
parent c64768a7d671bcde80bca2aed93f9e07edc069c3
parent f757397097d0713c949af76dccabb65a2785782e
parent 9a0b841586c3c6c846effdbe75885c2ebc0031b0
author Len Brown <len.brown@intel.com> 1202371865 -0500
committer Len Brown <len.brown@intel.com> 1202371865 -0500

Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release