summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/dma/nbpfaxi.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-22 01:07:44 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-22 01:07:44 +0400
commit29fdd5ba6297f865046e3793481be4979f75d85a (patch)
tree2c94f76f4b6f6ab683257e8e7c9480a85d6c3942 /Documentation/devicetree/bindings/dma/nbpfaxi.txt
parentd1433d55c75652e7af76b32188a1b5f8af654ab3 (diff)
parent4560d67722816cca4b2f3dfb1d7c5b902fd2075b (diff)
downloadlinux-29fdd5ba6297f865046e3793481be4979f75d85a.tar.xz
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Here is the fixup for the 'lowlight' of my last pull request. I2C is not selected anymore by I2C_ACPI. Instead, the code in question now depends on I2C=y. Also, Mika has agreed to support me and be the maintainer for I2C-ACPI related patches. Finally, a new-ID-patch came along last week" * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: add maintainer for ACPI parts of I2C i2c: i801: Add PCI ID for Intel Braswell i2c: rework kernel config I2C_ACPI
Diffstat (limited to 'Documentation/devicetree/bindings/dma/nbpfaxi.txt')
0 files changed, 0 insertions, 0 deletions