diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 04:51:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 04:51:39 +0100 |
| commit | 9f3a6284880ceea452903e2043c88d7226736318 (patch) | |
| tree | 2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04 /arch/x86/kernel/acpi/boot.c | |
| parent | Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | MIPS: BCM47xx: Fix 128MB RAM support (diff) | |
| download | linux-9f3a6284880ceea452903e2043c88d7226736318.tar.xz linux-9f3a6284880ceea452903e2043c88d7226736318.zip | |
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 'arch/x86/kernel/acpi/boot.c')
0 files changed, 0 insertions, 0 deletions