Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:42:25 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:42:25 +0000 (16:42 -0700)
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new command and cleanups


Trivial merge