[GIT PULL] MMC merge for 3.7-rc1, part 2

[Chris Ball]

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-part2

to receive two more changes for 3.7.  There are no conflicts.  Thanks.


The following changes since commit 12250d843e8489ee00b5b7726da855e51694e792:

  Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux (2012-10-11 10:27:51 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-part2

for you to fetch changes up to 60fe5771be6aa3f37d5887aa01c04f733130a559:

  UAPI: (Scripted) Disintegrate include/linux/mmc (2012-10-11 17:27:54 -0400)

----------------------------------------------------------------
 - Disintegrate UAPI, fix a mismerge that caused a build error.

----------------------------------------------------------------
David Howells (1):
      UAPI: (Scripted) Disintegrate include/linux/mmc

Marek Vasut (1):
      mmc: mxs-mmc: Fix merge issue causing build error

 drivers/mmc/host/mxs-mmc.c           | 2 +-
 include/linux/mmc/Kbuild             | 1 -
 include/uapi/linux/mmc/Kbuild        | 1 +
 include/{ => uapi}/linux/mmc/ioctl.h | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename include/{ => uapi}/linux/mmc/ioctl.h (100%)

-- 
Chris Ball   <cjb@xxxxxxxxxx>   <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/