From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Feb 2017 18:13:40 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v4.11-rc1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7;p=thirdparty%2Fkernel%2Flinux.git

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

Pull IDE updates from David Miller:
 "Just one actual change here this time around, adding some init data
  annotations. The other change was bogus and got reverted"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: palm_bk3710: add __initdata to palm_bk3710_port_info
  Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
  ide: Fix interface autodetection in legacy IDE driver (trial #2)
---

74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7