From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jun 2013 22:32:17 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: v3.10-rc6~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=33c929c06eb4a483a3e4ffbff58f6e4f31ae4565;p=~emulex%2Finfiniband.git

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree bug fixes from Grant Likely:
 "This branch contains the following bug fixes:
   - Fix locking vs. interrupts. Bug caught by lockdep checks
   - Fix parsing of cpp #line directive output by dtc
   - Fix 'make clean' for dtc temporary files.

  There is also a commit that regenerates the dtc lexer and parser files
  with Bison 2.5.  The only purpose of this commit is to separate the
  functional change in the dtc bug fix from the code generation change
  caused by a different Bison version"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  dtc: ensure #line directives don't consume data from the next line
  dtc: Update generated files to output from Bison 2.5
  of: Fix locking vs. interrupts
  kbuild: make sure we clean up DTB temporary files
---

33c929c06eb4a483a3e4ffbff58f6e4f31ae4565