Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 20:34:03 +0000 (12:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 20:34:03 +0000 (12:34 -0800)
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  dt/device: Fix auxdata matching to handle entries without a name override


Trivial merge