From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Jun 2009 16:04:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.30~13
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=c46f87f121f815a67e84379511310e5c03862a60;p=cascardo%2Flinux.git

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

c46f87f121f815a67e84379511310e5c03862a60