tree eb93535fcc3e568ffabd5400b019463633ea2c22
parent 1a67a573b8d9f02211f36fbab50f6265dc49384a
parent 50e07f888cb24b55e0d8283f631907794dd757c2
author Linus Torvalds <torvalds@linux-foundation.org> 1320418169 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320418169 -0700

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