summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-01-27 22:34:04 +0100
committerBjorn Helgaas <bhelgaas@google.com>2015-01-27 22:34:04 +0100
commite315110657e7335557a2500190b38ef33325a75c (patch)
tree518d51a4d0176c4f8db08896806e96d1fd8a1940 /drivers/w1
parentMerge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' an... (diff)
parentPCI: keystone: Fix misspelling of current function in debug output (diff)
parentPCI: tegra: Remove unnecessary tegra_pcie_fixup_bridge() (diff)
parentPCI: xgene: Include clk.h instead of clk-private.h (diff)
parentPCI: xilinx: Fix harmless format string warning (diff)
downloadlinux-e315110657e7335557a2500190b38ef33325a75c.tar.xz
linux-e315110657e7335557a2500190b38ef33325a75c.zip
Merge branches 'pci/host-keystone', 'pci/host-tegra', 'pci/host-xgene' and 'pci/host-xilinx' into next
* pci/host-keystone: PCI: keystone: Fix misspelling of current function in debug output * pci/host-tegra: PCI: tegra: Remove unnecessary tegra_pcie_fixup_bridge() * pci/host-xgene: PCI: xgene: Include clk.h instead of clk-private.h * pci/host-xilinx: PCI: xilinx: Fix harmless format string warning