diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 15:33:23 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 15:33:23 +0200 |
| commit | 39333610ba3b1e076ac1ceccca34de037a413a03 (patch) | |
| tree | a65c958206f5bcdebea561660c8d4733d5010309 /drivers/power/reset/Makefile | |
| parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
| parent | 2626063f86cdce500153e8550334b9331421dc6f (diff) | |
| parent | 464d6e18639c4347dafd8dbcee270674dd3d8fba (diff) | |
Merge branches 'at91-3.18-cleanup' and 'at91-3.18-dt' into at91-3.18-drivers