| commit | 74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 28 10:13:40 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 28 10:13:40 2017 -0800 |
| tree | 71f995a77c43624b8f3ac0d12463db702548c01e | |
| parent | c2eca00fec40a9b3551f0605834acad9336099d1 [diff] | |
| parent | 96297aee8bce237961b0e1b99e22913c5726af12 [diff] |
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)