diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:00:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:00:35 -0700 |
| commit | 7eeac505d912cfe5805290f8f9e293b134e00237 (patch) | |
| tree | 32b1e61bd01e390d4db24fba5ca941580c6db8ba /drivers/acpi/debug.c | |
| parent | KVM: MMU: Fix rare oops on guest context switch (diff) | |
| parent | [MIPS] 20Kc: Disable use of WAIT instruction. (diff) | |
| download | linux-dev-7eeac505d912cfe5805290f8f9e293b134e00237.tar.xz linux-dev-7eeac505d912cfe5805290f8f9e293b134e00237.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] 20Kc: Disable use of WAIT instruction.
[MIPS] Workaround for 4Kc machine check exception
[MIPS] Malta: Fix off by one bug in interrupt handler.
[MIPS] No ide_default_io_base() if PCI IDE was not found
[MIPS] Add #include <linux/profile.h> to arch/mips/kernel/time.c
[MIPS] N32 needs to use compat_sys_futimesat
[MIPS] rtlx: Fix build error.
[MIPS] rtlx: fix int vs. long bug.
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions