projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2eca00 96297ae)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Feb 2017 18:13:40 +0000 (10:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Feb 2017 18:13:40 +0000 (10:13 -0800)
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)


Trivial merge
John Crispins staging tree