diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 00:18:13 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 00:18:13 +0400 |
| commit | e55f1b1c00a2df492fbdaeb3fcba67a45bc82a0e (patch) | |
| tree | 96547759d8877fcca6b9b8a1f68066fe5c65b7fd /drivers/scsi/isci/host.c | |
| parent | 27a3b735b70651f28db03e5f92775a40661ba7a6 (diff) | |
| parent | f70e957cda22d309c769805cbb932407a5232219 (diff) | |
| download | linux-e55f1b1c00a2df492fbdaeb3fcba67a45bc82a0e.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Don't use the EFI reboot method by default
x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
x86, reboot: Acer Aspire One A110 reboot quirk
x86-32, NUMA: Fix boot regression caused by NUMA init unification on highmem machines
Diffstat (limited to 'drivers/scsi/isci/host.c')
0 files changed, 0 insertions, 0 deletions