From: Linus Torvalds Date: Wed, 26 Apr 2006 22:45:27 +0000 (-0700) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a82642fa190029a438c0d09edb0e5463a0fe9e1e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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