From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 20:44:18 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
X-Git-Tag: v3.1-rc1~321
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=0df55ea55bf1f4827115af4740899980b4fce77f;hp=-c

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (78 commits)
  mmc: MAINTAINERS: add myself as a tmio-mmc maintainer
  mmc: print debug messages for runtime PM actions
  mmc: fix runtime PM with -ENOSYS suspend case
  mmc: at91_mci: move register header from include/ to drivers/
  mmc: mxs-mmc: fix clock rate setting
  mmc: tmio: fix a deadlock
  mmc: tmio: fix a recently introduced bug in DMA code
  mmc: sh_mmcif: maximize power saving
  mmc: tmio: maximize power saving
  mmc: tmio: fix recursive spinlock, don't schedule with interrupts disabled
  mmc: Added quirks for Ricoh 1180:e823 lower base clock frequency
  mmc: omap_hsmmc: fix oops in omap_hsmmc_dma_cb()
  mmc: omap_hsmmc: refactor duplicated code
  mmc: omap_hsmmc: fix a few bugs when setting the clock divisor
  mmc: omap_hsmmc: introduce start_clock and re-use stop_clock
  mmc: omap_hsmmc: split duplicate code to calc_divisor() function
  mmc: omap_hsmmc: move hardcoded frequency constants to defines
  mmc: omap_hsmmc: correct debug report error status mnemonics
  mmc: block: fixed NULL pointer dereference
  mmc: documentation of mmc non-blocking request usage and design.
  ...
---

0df55ea55bf1f4827115af4740899980b4fce77f
diff --combined MAINTAINERS
index 72b979d5076b,63ee3a7a6712..789fed662140
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1,5 -1,4 +1,5 @@@
  
 +
  	List of maintainers and how to submit kernel changes
  
  Please try to follow the guidelines below.  This will make things
@@@ -4585,9 -4584,8 +4585,8 @@@ S:	Maintaine
  F:	drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
- M:	Madhusudhan Chikkature <madhu.cr@ti.com>
  L:	linux-omap@vger.kernel.org
- S:	Maintained
+ S:	Orphan
  F:	drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -6243,9 -6241,14 +6242,14 @@@ F:	drivers/char/toshiba.
  F:	include/linux/toshiba.h
  
  TMIO MMC DRIVER
+ M:	Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  M:	Ian Molton <ian@mnementh.co.uk>
+ L:	linux-mmc@vger.kernel.org
  S:	Maintained
- F:	drivers/mmc/host/tmio_mmc.*
+ F:	drivers/mmc/host/tmio_mmc*
+ F:	drivers/mmc/host/sh_mobile_sdhi.c
+ F:	include/linux/mmc/tmio.h
+ F:	include/linux/mmc/sh_mobile_sdhi.h
  
  TMPFS (SHMEM FILESYSTEM)
  M:	Hugh Dickins <hughd@google.com>
@@@ -6322,7 -6325,7 +6326,7 @@@ F:	drivers/scsi/u14-34f.
  
  UBI FILE SYSTEM (UBIFS)
  M:	Artem Bityutskiy <dedekind1@gmail.com>
 -M:	Adrian Hunter <adrian.hunter@nokia.com>
 +M:	Adrian Hunter <adrian.hunter@intel.com>
  L:	linux-mtd@lists.infradead.org
  T:	git git://git.infradead.org/ubifs-2.6.git
  W:	http://www.linux-mtd.infradead.org/doc/ubifs.html