summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/processor.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-23 15:02:21 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-23 15:02:21 +0200
commit32111abb508424d1d110fa471d940160abe251f5 (patch)
treeb44ace0e8ddfd249643cbe4b2c38e89238921fb7 /arch/powerpc/include/asm/processor.h
parentMerge branch 'spi-pl022' into spi-next (diff)
parentspi/pl022: Revert recent runtime PM changes (diff)
downloadlinux-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 'arch/powerpc/include/asm/processor.h')
0 files changed, 0 insertions, 0 deletions