summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-08-27 17:07:37 -0700
committerOlof Johansson <olof@lixom.net>2012-08-27 17:07:37 -0700
commit981ba65715f28c5d0247c71e49e2917f40b61632 (patch)
tree1477b5b09e4ca31eb6045bee3af3bed4bcae770b /Documentation
parent314949321ea821a47d266f2c09168a65aa439b3d (diff)
parent51a6149b89b822cacf572b2ca2a15cb6f2232b11 (diff)
downloadlinux-3.10-981ba65715f28c5d0247c71e49e2917f40b61632.tar.gz
linux-3.10-981ba65715f28c5d0247c71e49e2917f40b61632.tar.bz2
linux-3.10-981ba65715f28c5d0247c71e49e2917f40b61632.zip
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Fixes for AT91 related to: - move to sparse IRQ: some drivers were forgotten - a DTS typo - the delay for removal of old at91_mci driver * tag 'at91-fixes' of git://github.com/at91linux/linux-at91: ARM: at91/feature-removal-schedule: delay at91_mci removal ARM: at91/dts: remove partial parameter in at91sam9g25ek.dts ARM: at91/clock: fix PLLA overclock warning ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support ARM: at91: fix system timer irq issue due to sparse irq support
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index afaff312bf4..f4d8c7105fc 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more
----------------------------
What: at91-mci driver ("CONFIG_MMC_AT91")
-When: 3.7
+When: 3.8
Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support
was added to atmel-mci as a first step to support more chips.
Then at91-mci was kept only for old IP versions (on at91rm9200 and