From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jan 2012 20:34:03 +0000 (-0800)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.12-rc1~4188
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=115e8e705e4be071b9e06ff72578e3b603f2ba65;p=kernel%2Fkernel-generic.git

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
---

115e8e705e4be071b9e06ff72578e3b603f2ba65