diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:13:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:13:31 -0700 |
| commit | 9c9cb14387389a70fe40f9be99f243e2a410b0b7 (patch) | |
| tree | cb927908a099f6448f86871e3bbc3985139db6cd /drivers/s390 | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | c549e71d073a6e9a4847497344db28a784061455 (diff) | |
Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: ACPI 3, BIOS workaround for E820-probing code
x86, setup: preemptively save/restore edi and ebp around INT 15 E820
x86, setup: mark %esi as clobbered in E820 BIOS call
Diffstat (limited to 'drivers/s390')
0 files changed, 0 insertions, 0 deletions