From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 2 Apr 2006 20:32:55 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.17-rc1~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ef7a4567dc542d8cc563755478464ea928fede41;p=linux.git

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1
  [ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver)
---

ef7a4567dc542d8cc563755478464ea928fede41