tree d5c40f6a328e07edb2db7186bef3a6c932c404fb
parent 9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de
parent 95964018d53f479529dfdc2b46fe30c0a14a00e0
author Linus Torvalds <torvalds@linux-foundation.org> 1228261990 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228261990 -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:
  alim15x3: fix sparse warning
  ide: remove dead code from drive_is_ready()
  ide: fix build for DEBUG_PM
  ide: respect current DMA setting during resume
  ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[]
  amd74xx: workaround unreliable AltStatus register for nVidia controllers
  ide: fix the ide_release_lock imbalance