tree 87afe5df8802876a7937cfdcf977462c5c2399fe
parent ba6271ea6324decab4c47c4a55de95188d930792
parent 5a61dd9ec8c5a8e14fbccda3ab042555b692b9b2
author Linus Torvalds <torvalds@linux-foundation.org> 1220381051 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220381051 -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/Kconfig: mark ide-scsi as deprecated
  ide-disk: remove stale init_idedisk_capacity() documentation
  palm_bk3710: improve IDE registration
  ide: fix hwif_to_node()
  IDE: palm_bk3710: fix compile warning for unused variable
  IDE: compile fix for sff_dma_ops