Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2013 05:17:43 +0000 (14:17 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2013 05:17:43 +0000 (14:17 +0900)
commitc681427e5ca22925fcc1be76a2e260a11e0a8498
tree5518d76ef0723177dfbb14546155f55532dcd96f
parent1b2722752fe7bf21e76c87080add6d6c40af339f
parentc2f7d1e103ef1b5f3bd6a8a09aebf5eac7df4aca
Merge git://git./linux/kernel/git/davem/ide

Pull IDE updates from David Miller:
 "Just some minor cleanups and simplifications"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: pmac: remove unnecessary pci_set_drvdata()
  ide: cs5536: use module_pci_driver()
  ide: pmac: Remove casting the return value which is a void pointer