summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 18:37:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 18:37:07 +0200
commit53d1e658df6e26d62500410719aaee2b82067c03 (patch)
tree80dc082c1f256c481f152a62c74605c8962251a6 /arch/arm/kernel
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/pa... (diff)
parentRevert "dt: add of_alias_scan and of_alias_get_id" (diff)
downloadlinux-53d1e658df6e26d62500410719aaee2b82067c03.tar.xz
linux-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/arm/kernel')
0 files changed, 0 insertions, 0 deletions