diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-10-07 15:19:01 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-07 15:19:01 -0700 |
| commit | 6391987d6f8ced7d0fafaa1440dcc57bb4b34d8f (patch) | |
| tree | 027a3989fceb18c45cf6d435a87b9879e38b8216 /Documentation/power/s2ram.txt | |
| parent | 9646b7985e906e5fcea9375f016b4519c8318c21 (diff) | |
| parent | e8689e63d4d2046079f2db9d494ac05c6885ac0c (diff) | |
| parent | 0d688662aab9d80078be82aa5aea561346643298 (diff) | |
| parent | 1f1846c6ceed07c03ef036a27864befe0f773997 (diff) | |
| parent | 20dd63900d238e17b122fe0c7376ff090867f528 (diff) | |
Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine