summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 15:10:30 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 15:10:30 -1000
commit27665ffa22b9b83bab226bf12c61424f7f1f8995 (patch)
treeaaccc030778bb6878c46ab9ca035901af67d78e4 /drivers/acpi
parent14595f708eeb528fabcee339ed0b9e0a2ecec73f (diff)
parent750f463a749e28464151ad26938d11b07b1c43cb (diff)
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: dt: add of_alias_scan and of_alias_get_id
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions