aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 22:51:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-22 22:51:39 -0500
commit9f3a6284880ceea452903e2043c88d7226736318 (patch)
tree2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04 /drivers/acpi
parent26b0833366c2521b890dfa8cb0e922be7debed37 (diff)
parent84a6fcb368a080620d12fc4d79e07902dbee7335 (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: BCM47xx: Fix 128MB RAM support MIPS: Highmem: Fix build error
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions