summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-12 06:54:05 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-12 06:54:05 +0300
commitb4a237598aa740562f842db76d97465c44fb74c1 (patch)
treecadb4228d51a984360b4b3fdd7534731e2211f11 /Documentation
parentc970872e59e46774d508777291b2f90910ab695b (diff)
parentb1d06b60e90cd5016798b9984f8e420e753f4846 (diff)
downloadlinux-b4a237598aa740562f842db76d97465c44fb74c1.tar.xz
Merge tag 'devicetree-fixes-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring: - Add empty of_translate_address needed for HiSilicon network driver. - Fix alignment requirements for CMA regions in DT. - Fix booting on PPC systems which can't do WARN() early. - Rename ak4554 binding doc from .c to .txt. * tag 'devicetree-fixes-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of: Provide static inline function for of_translate_address if needed drivers: of: of_reserved_mem: fixup the alignment with CMA setup of: Print rather than WARN'ing when overlap check fails dt-bindings: ak4554: extension should be .txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/sound/ak4554.txt (renamed from Documentation/devicetree/bindings/sound/ak4554.c)0
1 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/ak4554.c b/Documentation/devicetree/bindings/sound/ak4554.txt
index 934fa02754b3..934fa02754b3 100644
--- a/Documentation/devicetree/bindings/sound/ak4554.c
+++ b/Documentation/devicetree/bindings/sound/ak4554.txt