From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 26 Apr 2006 22:45:27 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.17-rc3~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a82642fa190029a438c0d09edb0e5463a0fe9e1e;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] pxamci: fix data timeout calculation
---

a82642fa190029a438c0d09edb0e5463a0fe9e1e