diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 15:02:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 15:02:21 +0200 |
| commit | 32111abb508424d1d110fa471d940160abe251f5 (patch) | |
| tree | b44ace0e8ddfd249643cbe4b2c38e89238921fb7 /net/mac80211/iface.c | |
| parent | Merge branch 'spi-pl022' into spi-next (diff) | |
| parent | spi/pl022: Revert recent runtime PM changes (diff) | |
| download | linux-32111abb508424d1d110fa471d940160abe251f5.tar.xz linux-32111abb508424d1d110fa471d940160abe251f5.zip | |
Merge tag 'spi-linus' into spi-next
spi: Fixes for v3.7
A bunch of fixes here, mostly minor except for the pl022 which has just
been a bit of a shambles all round, the recent runtime PM changes have
as far as I can tell never worked so they're just getting thrown out.
Conflicts:
drivers/spi/spi-pl022.c
Diffstat (limited to 'net/mac80211/iface.c')
0 files changed, 0 insertions, 0 deletions