| commit | ac48f6cb5f268daff06b636444819e5ffb462611 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Sep 25 13:41:02 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Sep 25 13:41:02 2012 +0100 |
| tree | 56bcc8b2de42738764ac65056067a17cb97609f4 | |
| parent | e64d07a2dae569fc3c938adac777562a1d6f151e [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
Merge tag 'v3.6-rc6' into spi-mxs Linux 3.6-rc6 Conflicts (overlap between moving code that accesses registers around and factoring the register access out into a SSP layer): drivers/mmc/host/mxs-mmc.c