From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Nov 2011 14:49:29 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.2-rc1~66
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6b1506c66809ddf6afd17e330db2999c878b5d90

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: add empty of_machine_is_compatible
  ahci: add DT binding for Calxeda AHCI controller
  dt/platform: minor cleanup
  dt: add empty of_alias_get_id() for non-dt builds
---

6b1506c66809ddf6afd17e330db2999c878b5d90