From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 04:05:33 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0fcf12d510b6d1b1b090a090c62009310eca4be4;p=openwrt%2Fstaging%2Fblogic.git

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

0fcf12d510b6d1b1b090a090c62009310eca4be4