]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Sep 2013 18:57:26 +0000 (11:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Sep 2013 18:57:26 +0000 (11:57 -0700)
Pull DeviceTree fixes from Rob Herring:
 "Clean-up to fix some warnings for !OF builds and spelling fixes in
  docs:

   - Clean-up openrisc prom.h
   - Fix warnings caused by of_irq.h ifdefs
   - Spelling fix for Synopsys"

* tag 'devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dts: Fix misspelling of Synopsys
  of: clean-up ifdefs in of_irq.h
  openrisc: clean-up prom.h


Trivial merge