tree 8ef96f62ed5239442cd55ad54ea5c97b0441e613
parent 733bbb7e1c3acb8fabc55595bf1df8973dde7736
parent f88e1ae8acb8affac29034ed79d4fff95ac8c29d
author Linus Torvalds <torvalds@linux-foundation.org> 1325536443 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325536443 -0800

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