tree 6a9005cadbe8968adcf75204541d8fa6bbad5b2c
parent a2308b7f0838406c346a2b0259ff88c7fcf41e79
parent 56ca904053ab14ba4067a72b69a5edf246771209
author Linus Torvalds <torvalds@g5.osdl.org> 1144009975 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1144009975 -0700

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)