tree e131db71d1db9a3b8591d718e8c5e897daadccec
parent ea541686d8454efac4f2b5c0767affb12d4b6a52
parent fa3fd7204e1a4e8538117f0edbfecd4132276860
author Linus Torvalds <torvalds@linux-foundation.org> 1224803291 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224803291 -0700

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: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c
  ide-disk: set non-rotational queue flag for SSD and CF devices
  ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list
  ide: Add tx4938ide driver (v2)
  TXx9: Add TX4938 ATA support (v3)
  ide: Add tx4939ide driver (v6)
  ide: two more pci_ioremap_bar() conversions
  pci: use pci_ioremap_bar() in drivers/ide
  sgiioc4: use ide_host_add() (take 2)
  sgiioc4: fix error cleanup path (take 2)