Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
  mmc: dw_mmc: support mmc power control with regulator
  mmc: dw_mmc: fix suspend/resume operation
  mmc: dw_mmc: add quirks for unreliable card detect, and capabilities
  mmc: tmio: fix address in kunmap_atomic() calls
  mmc: core: reset card voltage after power off
  mmc: core: export function mmc_do_release_host()
  mmc: sdio: remember new card RCA when redetecting card
  mmc: dw_mmc: Remove set-but-unused variable.
  mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35
  mmc: sdhci-esdhc: broken card detection is not a default quirk
  mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35
  mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg()
  mmc: sh_mmcif: support aggressive clock gating
  mmc: check if mmc cards < 2GB do sector addressing
  mmc: core: comment on why sdio_reset is done at init time
  mmc: dw_mmc: support DDR mode
  mmc: via-sdmmc: Remove set-but-unused variable.
  mmc: cb710: Return err value in cb710_wait_while_busy()
  mmc: sdhci-pci: Remove set-but-unused variable.
  mmc: mxs-mmc: add mmc host driver for i.MX23/28
  ...

1 files changed, 21 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-mmc b/Documentation/ABI/testing/sysfs-devices-mmc
new file mode 100644
index 000000000000..5a50ab655843
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-mmc
@@ -0,0 +1,21 @@
+What:           /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_offset
+Date:           January 2011
+Contact:        Chuanxiao Dong <chuanxiao.dong@intel.com>
+Description:
+                Enhanced area is a new feature defined in eMMC4.4 standard.
+                eMMC4.4 or later card can support such feature. This kind of
+                area can help to improve the card performance. If the feature
+                is enabled, this attribute will indicate the start address of
+                enhanced data area. If not, this attribute will be -EINVAL.
+                Unit Byte. Format decimal.
+
+What:           /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_size
+Date:           January 2011
+Contact:        Chuanxiao Dong <chuanxiao.dong@intel.com>
+Description:
+                Enhanced area is a new feature defined in eMMC4.4 standard.
+                eMMC4.4 or later card can support such feature. This kind of
+                area can help to improve the card performance. If the feature
+                is enabled, this attribute will indicate the size of enhanced
+                data area. If not, this attribute will be -EINVAL.
+                Unit KByte. Format decimal.