diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 14:41:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 14:41:02 +0200 |
| commit | ac48f6cb5f268daff06b636444819e5ffb462611 (patch) | |
| tree | 56bcc8b2de42738764ac65056067a17cb97609f4 /drivers/spi/spi-tegra.c | |
| parent | spi/mxs: Make the SPI block clock speed configurable via DT (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-ac48f6cb5f268daff06b636444819e5ffb462611.tar.xz linux-ac48f6cb5f268daff06b636444819e5ffb462611.zip | |
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
Diffstat (limited to 'drivers/spi/spi-tegra.c')
0 files changed, 0 insertions, 0 deletions