48582b2e3b87b794a9845d488af2c76ce055502b reset: add missing empty function reset_control_rearm() e8d6f9e56187c101b325e8d18f1d4032420d08ff ata: ahci_brcm: Fix use of BCM7216 reset controller bb610757fcd74558ad94fe19993fd4470208dd02 PCI: brcmstb: Use reset/rearm instead of deassert/assert c2c57ffb13484b9d0077063e7207e4150eab9543 Merge branch 'pci/enumeration' 1d4a213be578721b8bef7f75d0b5d8357b7d73b9 Merge branch 'pci/error' f11f6380665f5585bc2844e6d232a88f78078bc0 Merge branch 'pci/hotplug' e8b067d0ccfd7adb568dc6d6aeb9cc9037ddbdd1 Merge branch 'pci/pm' e161a83d6a56561f6c16d3ce47e30b4d207d3551 Merge branch 'pci/vpd' db9ff1bf56a5910852d9283fff951d2ac1fe070c Merge branch 'pci/sysfs' c6c3d84fca2771dcc6cbeac6c6b511e9a828a3b0 Merge branch 'pci/kernel-doc' 4a0d241a65db9ae534f1a934254d1525c03038cc Merge branch 'pci/misc' fb1049e4cb6c8bae385ff7df71ac8b2b96c6aeaa Merge branch 'remotes/lorenzo/pci/altera-msi' 34cbf59030769bcaf43830860a79c6d8cde4cf03 Merge branch 'remotes/lorenzo/pci/brcmstb' 6899b0867ba90f64087064fe782f626176f87d5e Merge branch 'remotes/lorenzo/pci/cadence' 263313bf6cd889469b1e8ec33d883c6603276a27 Merge branch 'remotes/lorenzo/pci/dwc' 17a449b86ed92e5d58f0d2ccceeb0a69c62f184b Merge branch 'remotes/lorenzo/pci/endpoint' 5d07236a30eca6b7faa40aef029c896fd1878730 Merge branch 'remotes/lorenzo/pci/iproc' 91bbabf2cfc15578f5dd2fcd5bb34e1fb9889e80 Merge branch 'remotes/lorenzo/pci/layerscape' ce6d2d503caccce19f7f6db250d8981f3d0f00b9 Merge branch 'remotes/lorenzo/pci/mediatek' 76fd12368daf9ab0a2d43ef3b237423c214fd2db Merge branch 'remotes/lorenzo/pci/microchip' 6181ca425f088ad1043d5544579b6d1a654399b0 Merge branch 'remotes/lorenzo/pci/tegra' 8b6f4f7b500be9c12ae104c5bc803f4650aa3d42 Merge branch 'remotes/lorenzo/pci/vmd' 29b90b331365dc85052e6005d7e5be21cfa2ee36 Merge branch 'remotes/lorenzo/pci/xgene' cbb324a0fbab47d56abd2831fb93d061e31ec514 Merge branch 'remotes/lorenzo/pci/xilinx' aeb6e2dc6bb08dec29b5f917fbf71b1a47fe9706 Merge branch 'remotes/lorenzo/pci/msi' d396f3dce10adc2278e9b76aaa5653bff71bd600 Merge branch 'remotes/lorenzo/pci/misc' 04e0b1384187405a52c5590d406f74456b334d2c Merge branch 'pci/brcmstb' 19e1547b448cc1b693e60336c534977c40829415 Merge branch 'pci/tegra'