diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 21:15:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 21:15:13 +0200 |
| commit | d255c59aab2a3fdf0bb8a5db75e50d9c926c3bb9 (patch) | |
| tree | 79381622fe3bec449cf8f895087f87e9d56b6cc1 /drivers/cpufreq/acpi-cpufreq.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | mtd: gpmi: fix ECC regression (diff) | |
| download | linux-d255c59aab2a3fdf0bb8a5db75e50d9c926c3bb9.tar.xz linux-d255c59aab2a3fdf0bb8a5db75e50d9c926c3bb9.zip | |
Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd
Pull final mtd fixes from Brian Norris:
"A few more last-minute regression fixes, prepared jointly by me and
David Woodhouse:
- Revert pxa3xx to its old name to avoid breaking existing
'mtdparts=' boot strings.
- Return GPMI NAND to its legacy ECC layout for backwards
compatibility. We will revisit this in 3.13.
A note from David on the latter fix: 'This leaves a harmless cosmetic
warning about an unused function. At this point in the cycle I really
don't care.'"
* tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd:
mtd: gpmi: fix ECC regression
mtd: nand: pxa3xx: Fix registered MTD name
Diffstat (limited to 'drivers/cpufreq/acpi-cpufreq.c')
0 files changed, 0 insertions, 0 deletions