projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7
tree71f995a77c43624b8f3ac0d12463db702548c01etree | snapshot
parentc2eca00fec40a9b3551f0605834acad9336099d1commit | diff
parent96297aee8bce237961b0e1b99e22913c5726af12commit | diff
Merge git://git./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)
John Crispins staging tree