Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2009 16:04:55 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2009 16:04:55 +0000 (09:04 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  pdc202xx_old: fix resetproc() method
  pdc202xx_old: fix 'pdc20246_dma_ops'


Trivial merge