tree 02fa80c65f4a8cf61724594c5181246da0c48945
parent 140d0b2108faebc77c6523296e211e509cb9f5f9
parent 0302899e144296d6ce8cb3679a9a42d5c6436910
author Linus Torvalds <torvalds@linux-foundation.org> 1312562470 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312562470 -1000

Merge git://git.kernel.org/pub/scm/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