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

* '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'