From: Wolfgang Denk <wd@denx.de>
Date: Wed, 16 Nov 2011 18:53:37 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v2011.12-rc1~225
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4ed004b65caf6e79117b9ff2648f7b7c3afe58d;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  Tegra2: mmc: Factor out mmc_wait_inhibit functionality
  Tegra2: mmc: Add data transfer completion timeout
  Tegra2: mmc: Support DMA restarts at buffer boundaries
  Tegra2: mmc: define register field values in tegra2_mmc.h
  MMC: PL180: Fix infinite loop with VExpress extended fifo implementation
---

e4ed004b65caf6e79117b9ff2648f7b7c3afe58d