diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:16 +0000 |
| commit | d84dbf33512d68b81f6a9635cff954f5b562a043 (patch) | |
| tree | eee450350d570f3458c6265713a2a414aac35ca7 /kernel/power/swap.c | |
| parent | 4f1eacf5447c35daa29bc8ad828af0c21f903fda (diff) | |
| parent | 97d62a3096355168db71bdcbc618cbf2c3b7c2a0 (diff) | |
| parent | 7c47cd7ffd5e8fca28258e6e04207ad154d719e4 (diff) | |
| parent | d7c42ff8c34f1c291fcd45c7d56d41aba68c4b13 (diff) | |
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next