Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:35:04 +0000 (21:35 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:35:04 +0000 (21:35 -0800)
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected
  [MMC] Add OMAP MMC host driver


Trivial merge