Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:27 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:27 +0000 (15:45 -0700)
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] pxamci: fix data timeout calculation


Trivial merge