Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 22:29:01 +0000 (15:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 22:29:01 +0000 (15:29 -0700)
commitfc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a
treed1b2cc23c1b3cc9e73ea817ab0a7aa8d3391f320
parentb14662cae0f765355d43357180f4c34916610269
parent64110c16e012547d5c9ab71f8afd3bab025f1103
Merge git://git./linux/kernel/git/davem/ide

Pull IDE changes from David Miller:
 "Mostly cleanups, and changes part of tree-wide adjustments, this code
  is in deep freeze so that's pretty much what we expect these days"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: sgiioc4: Staticize ioc4_ide_attach_one()
  ide: palm_bk3710: add missing __iomem annotation
  ide: use dev_get_platdata()
  ide-disk_proc: use macro to replace magic number
  ide: replace strict_strtol() with kstrtol()