Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
commit115e8e705e4be071b9e06ff72578e3b603f2ba65
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 20:34:03 +0000 (2 12:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jan 2012 20:34:03 +0000 (2 12:34 -0800)
tree8ef96f62ed5239442cd55ad54ea5c97b0441e613
parent733bbb7e1c3acb8fabc55595bf1df8973dde7736
parentf88e1ae8acb8affac29034ed79d4fff95ac8c29d
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  dt/device: Fix auxdata matching to handle entries without a name override