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 | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 (diff) | |
| parent | Revert "dt: add of_alias_scan and of_alias_get_id" (diff) | |
| download | linux-dev-53d1e658df6e26d62500410719aaee2b82067c03.tar.xz linux-dev-53d1e658df6e26d62500410719aaee2b82067c03.zip | |
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')
0 files changed, 0 insertions, 0 deletions