commit 4ece92df296f472e49d26ee38ddbed4596458132
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 10 18:15:41 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 10 18:15:41 2013 -0700
tree 0b2960114194d20769273dadb0bf2897c8e0206a
parent 75fcf64dc7180a6258dbefd671edb9d86a38d22f
parent 1581208b2f0643eebfa7a3fbe5bad831c0bb7f0e

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE updates from David Miller:
 "Just a few small things:

   1) module_platform_driver_probe() conversions from Jingoo Han.

   2) module_pci_driver() conversion from Libo Chen.

   3) PIO size calculation fix from Steven J Hill"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: Fix IDE PIO size calculation
  drivers/ide/delkin_cb: Convert to module_pci_driver
  ide: gayle: use module_platform_driver_probe()
  ide: tx4939ide: use module_platform_driver_probe()
  ide: tx4938ide: use module_platform_driver_probe()