Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 16:41:10 +0000 (06:41 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 16:41:10 +0000 (06:41 -1000)
commit5fdb32472ec6cd1d62788d8872585b342b5d1d92
tree02fa80c65f4a8cf61724594c5181246da0c48945
parent140d0b2108faebc77c6523296e211e509cb9f5f9
parent0302899e144296d6ce8cb3679a9a42d5c6436910
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