Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull MMC changes from Chris Ball
 - at91-mci: This driver will be replaced by atmel-mci in 3.7.
 - atmel-mci: Add support for old at91-mci hardware.
 - dw_mmc: Allow multiple controllers; this previously caused
   corruption.
 - imxmmc: Remove this driver, replaced by mxcmmc.
 - mmci: Add device tree support.
 - omap: Allow multiple controllers.
 - omap_hsmmc: Auto CMD12, DDR support.
 - tegra: Support SD 3.0 spec.

Fix up the usual trivial conflicts in feature-removal-schedule.txt

* tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)
  mmc: at91-mci: this driver is now deprecated
  mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq
  mmc: block: Allow disabling 512B sector size emulation
  mmc: atmel-mci: add debug logs
  mmc: atmel-mci: add support for version lower than v2xx
  mmc: atmel-mci: change the state machine for compatibility with old IP
  mmc: atmel-mci: the r/w proof capability lack was not well managed
  mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug
  mmc: omap: convert to module_platform_driver
  mmc: omap: make it behave well as a module
  mmc: omap: convert to per instance workqueue
  mmc: core: Remove dead code
  mmc: card: Avoid null pointer dereference
  mmc: core: Prevent eMMC VCC supply to be cut from late init
  mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
  mmc: queue: remove redundant memsets
  mmc: queue: rename mmc_request function
  mmc: core: skip card initialization if power class selection fails
  mmc: core: fix the signaling 1.8V for HS200
  mmc: core: fix the decision of HS200/DDR card-type
  ...

diff --cc Documentation/feature-removal-schedule.txt
index 4ba1eb7590a70d489a131fc879bac5c7c5f6d5da,d212f83f17cf68f0e74d15c5200f050007cdca0a..ebaffe208ccb73e0727879ab1806830b5a66b5dc
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -561,37 -542,11 +561,48 @@@ Who:    Sasikantha Babu <sasikanth.v19@gma
  
  ----------------------------
  
 +What: remove bogus DV presets V4L2_DV_1080I29_97, V4L2_DV_1080I30 and
 +      V4L2_DV_1080I25
 +When: 3.6
 +Why:  These HDTV formats do not exist and were added by a confused mind
 +      (that was me, to be precise...)
 +Who:  Hans Verkuil <hans.verkuil@cisco.com>
 +
 +----------------------------
 +
 +What: V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls
 +When: 3.7
 +Why:  The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated
 +      for about 4 years and they are not used by any mainline driver.
 +      There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide
 +      similar functionality.
 +Who:  Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
 +
 +----------------------------
 +
 +What: cgroup option updates via remount
 +When: March 2013
 +Why:  Remount currently allows changing bound subsystems and
 +      release_agent.  Rebinding is hardly useful as it only works
 +      when the hierarchy is empty and release_agent itself should be
 +      replaced with conventional fsnotify.
 +
 +----------------------------
 +
 +What: KVM debugfs statistics
 +When: 2013
 +Why:  KVM tracepoints provide mostly equivalent information in a much more
 +        flexible fashion.
 +
 +----------------------------
++
+ What: at91-mci driver ("CONFIG_MMC_AT91")
+ When: 3.7
+ 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
+       at91sam9261). The support of these IP versions has just been added
+       to atmel-mci, so atmel-mci can be used for all chips.
+ Who:  Ludovic Desroches <ludovic.desroches@atmel.com>
++
++----------------------------

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge