ac48f6cb Tue Sep 25 07:41:02 CDT 2012 Mark Brown <broonie@opensource.wolfsonmicro.com> 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