tree f8a55625cef3e754702add71acaf9958edfd8352
parent d5545fa0056ff2982f8a6419bd9a6ba2674deefd
parent ac1623625c5818bbdf5c68973098ba386ba7a004
author Linus Torvalds <torvalds@linux-foundation.org> 1213991207 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213991207 -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:
  BAST: Remove old IDE driver
  pcmcia ide kingston compactflash's have a new manufacturer id
  pcmcia: add another pata/ide ID
  pcmcia: add an pata/ide ID
  ide: increase timeout in wait_drive_not_busy()
  palm_bk3710: fix resource management