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)
commit500156a0f0e81e24991f5f0db56e859db1fbdacf
tree0167cb28731e2c6fd7da2ea21f301312eea6504a
parent5b67e8dd5ae889fea7d01b905a570fa9a37b8785
parentc65631781eb0f2e81865017c1484e9aef76e1b61
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* 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