diff options
| author | Roland Dreier <roland@purestorage.com> | 2011-05-12 08:57:20 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-05-12 08:57:20 -0700 |
| commit | 1df9fad1220beb21b4b4230373cbf4924436dd88 (patch) | |
| tree | 439df63eee43e198b3b593aebfc094a9ddf29ef4 /kernel/power/main.c | |
| parent | d0c49bf391b2e230a8f3ae4486da7df440f1216d (diff) | |
| parent | 2f25e9a540951ebd533b9b98d2259deb44b0b476 (diff) | |
| parent | 1c65335714e99864a438b0d757c8736d3c6e7d79 (diff) | |
Merge branches 'cma', 'cxgb4' and 'qib' into for-next