From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 22:29:01 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a;p=linux-beck.git

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

fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a