diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 06:37:07 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 06:37:07 -1000 |
| commit | 53d1e658df6e26d62500410719aaee2b82067c03 (patch) | |
| tree | 80dc082c1f256c481f152a62c74605c8962251a6 /arch/arm | |
| parent | 455ce9d8410d381f56a1676449a723ca1985b369 (diff) | |
| parent | fe55c1844a1c106e9d9d3dd27cbfcf8caeb9e77e (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:
Revert "dt: add of_alias_scan and of_alias_get_id"
dt: remove of_alias_get_id() reference
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions