From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Nov 2008 21:32:26 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.28-rc3~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ae29a18594c40a344ddd5bcd6abe575786a5d978;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-gd: re-get capacity on revalidate
  tx4938ide: Avoid underflow on calculation of a wait cycle
  tx4938ide: Do not call devm_ioremap for whole 128KB
  tx4938ide: Check minimum cycle time and SHWT range (v2)
  ide: Switch to a common address
  ide-cd: fix DMA alignment regression
---

ae29a18594c40a344ddd5bcd6abe575786a5d978