Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:05:33 +0000 (21:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:05:33 +0000 (21:05 -0700)
commit0fcf12d510b6d1b1b090a090c62009310eca4be4
treebdede7832707c398856cc18578dfa7a0d4a34083
parent4d15393d20c1934a296a999d8ede125532d21cc4
parentcd078af65d5c2f19c0f378062b07a0a79b000723
Merge git://git./linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  tx493xide: use min_t() macro instead of min()
  drivers/ide: Use memdup_user
  via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support.
  ide-cd: Do not access completed requests in the irq handler