| commit | 6b1506c66809ddf6afd17e330db2999c878b5d90 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 04 07:49:29 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 04 07:49:29 2011 -0700 |
| tree | eb93535fcc3e568ffabd5400b019463633ea2c22 | |
| parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a [diff] | |
| parent | 50e07f888cb24b55e0d8283f631907794dd757c2 [diff] |
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