From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Aug 2011 16:41:10 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v3.1-rc1~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fdb32472ec6cd1d62788d8872585b342b5d1d92;p=platform%2Fkernel%2Flinux-exynos.git

Merge git://git./linux/kernel/git/davem/ide

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers/ide/cy82c693.c: Add missing pci_dev_put
  ide: Fix irq flags madness
---

5fdb32472ec6cd1d62788d8872585b342b5d1d92