diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:13 +0000 |
| commit | 4f1eacf5447c35daa29bc8ad828af0c21f903fda (patch) | |
| tree | b33d8f61da2d35943259b55e538a556a0d839a59 /kernel/power/swap.c | |
| parent | d40d19447b602bf49d7909eb3c2fe6426fad98ce (diff) | |
| parent | 7c27ba46792d3596a83f28243e235a92cba80d45 (diff) | |
| parent | 7a3a907022439524704caecb717639aea2f1ef9c (diff) | |
| parent | c41cda1dbe50816d839c32271007c7b832d4d14a (diff) | |
| parent | 5396ecf7b1920595deec83b902502bd3d2da184e (diff) | |
| parent | 3a96878e6d01b70836cbf8a0e968619ef2e2aceb (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic/intel', 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next