tree 07e4e7e49ca0a891735e9da20929ddf61606c7ba
parent 0bf82cccd1e17135f880c161bc7926f5b25df34c
parent 52ebb438e952c674e5a5c131292589db9bcf169b
author Linus Torvalds <torvalds@linux-foundation.org> 1225661546 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1225661546 -0800

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