Linus Torvalds
d403a6484f
Merge phase #1 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
This merges phase 1 of the x86 tree, which is a collection of branches:
x86/alternatives, x86/cleanups, x86/commandline, x86/crashdump,
x86/debug, x86/defconfig, x86/doc, x86/exports, x86/fpu, x86/gart,
x86/idle, x86/mm, x86/mtrr, x86/nmi-watchdog, x86/oprofile,
x86/paravirt, x86/reboot, x86/sparse-fixes, x86/tsc, x86/urgent and
x86/vmalloc
and as Ingo says: "these are the easiest, purely independent x86 topics
with no conflicts, in one nice Octopus merge".
* 'x86-v28-for-linus-phase1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (147 commits)
x86: mtrr_cleanup: treat WRPROT as UNCACHEABLE
x86: mtrr_cleanup: first 1M may be covered in var mtrrs
x86: mtrr_cleanup: print out correct type v2
x86: trivial printk fix in efi.c
x86, debug: mtrr_cleanup print out var mtrr before change it
x86: mtrr_cleanup try gran_size to less than 1M, v3
x86: mtrr_cleanup try gran_size to less than 1M, cleanup
x86: change MTRR_SANITIZER to def_bool y
x86, debug printouts: IOMMU setup failures should not be KERN_ERR
x86: export set_memory_ro and set_memory_rw
x86: mtrr_cleanup try gran_size to less than 1M
x86: mtrr_cleanup prepare to make gran_size to less 1M
x86: mtrr_cleanup safe to get more spare regs now
x86_64: be less annoying on boot, v2
x86: mtrr_cleanup hole size should be less than half of chunk_size, v2
x86: add mtrr_cleanup_debug command line
x86: mtrr_cleanup optimization, v2
x86: don't need to go to chunksize to 4G
x86_64: be less annoying on boot
x86, olpc: fix endian bug in openfirmware workaround
...
2008-10-10 08:28:58 -07:00
..
2008-10-10 08:28:58 -07:00
2008-10-10 08:28:58 -07:00
2008-07-10 10:13:51 -07:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-08-15 13:56:56 +02:00
2008-09-18 09:25:44 +02:00
2008-09-30 10:25:28 +02:00
2008-08-14 11:18:08 +02:00
2008-08-14 11:18:08 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-08 13:13:15 +02:00
2008-07-22 21:53:53 +02:00
2008-08-15 16:53:24 +02:00
2008-08-25 22:45:37 -07:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-04-27 12:00:29 +03:00
2008-09-24 09:57:47 +02:00
2008-09-09 11:54:53 -07:00
2008-06-18 13:11:01 +02:00
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus
2008-07-21 16:37:17 +02:00
2008-08-18 08:50:19 +02:00
2008-07-08 11:49:49 +02:00
2008-10-03 10:18:30 +02:00
2008-07-23 18:00:30 -07:00
2008-07-24 12:33:38 +02:00
2008-06-23 22:10:56 +02:00
2008-07-30 09:41:48 -07:00
2008-07-20 10:21:10 +02:00
2008-08-22 14:12:20 +02:00
2008-06-19 14:19:03 +02:00
2008-06-05 15:10:02 +02:00
2008-09-29 10:04:53 +02:00
2008-07-27 21:43:11 +02:00
2008-07-16 11:07:30 +02:00
2008-07-08 13:16:14 +02:00
2008-09-06 07:21:17 +02:00
2008-06-23 22:10:56 +02:00
2008-07-01 11:03:31 +02:00
2008-04-26 17:35:47 +02:00
2008-06-02 11:55:52 +02:00
2008-05-16 17:22:20 -04:00
2008-08-11 10:37:34 +02:00
2008-08-11 10:37:34 +02:00
2008-09-03 16:42:51 -07:00
2008-07-22 14:35:57 +02:00
2008-07-25 11:57:46 +05:30
2008-09-04 10:51:36 -07:00
2008-09-04 10:51:36 -07:00
2008-05-24 16:47:39 +02:00
2008-07-24 12:49:26 -07:00
2008-09-10 14:03:49 +02:00
2008-10-06 13:50:59 -05:00
2008-07-25 10:53:30 -07:00
2008-08-22 05:34:44 +02:00
2008-07-20 12:42:37 +03:00
2008-08-14 12:19:59 +02:00
2008-08-15 08:35:43 -07:00
2008-07-26 12:00:04 -07:00
2008-07-21 16:45:56 +02:00
2008-04-17 17:40:49 +02:00
2008-08-15 17:12:32 +02:00
2008-07-26 16:40:33 +02:00
2008-08-18 07:49:06 +02:00
2008-07-24 10:47:21 -07:00
2008-08-18 07:49:26 +02:00
2008-08-25 17:46:12 -07:00
2008-09-22 19:48:19 +02:00
2008-08-21 12:52:01 +02:00
2008-09-24 10:29:04 +02:00
2008-08-15 16:53:25 +02:00
2008-07-08 13:15:52 +02:00
2008-09-22 13:08:57 +02:00
2008-08-21 10:01:52 +02:00
2008-08-11 12:57:01 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-26 12:00:03 -07:00
2008-07-26 12:00:03 -07:00
2008-09-22 12:58:36 +02:00
2008-07-08 12:50:05 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-10-06 18:16:40 +02:00
2008-06-24 21:02:31 +03:00
2008-07-15 10:39:57 -07:00
2008-05-25 08:58:30 +02:00
2008-08-25 12:31:32 +02:00
2008-08-15 08:35:42 -07:00
2008-04-17 17:41:29 +02:00
2008-06-12 18:05:42 -07:00
2008-09-22 13:08:57 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-31 18:21:32 +02:00
2008-10-06 18:16:40 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-06 14:01:50 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-08-15 19:16:05 +02:00
2008-06-30 09:20:55 +02:00
2008-07-16 12:15:17 -07:00
2008-06-10 11:34:42 +02:00
2008-07-22 14:35:57 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-22 21:53:53 +02:00
2008-07-24 10:47:29 -07:00
2008-04-17 17:41:15 +02:00
2008-07-22 14:36:01 +02:00
2008-07-09 07:43:27 +02:00
2008-06-26 11:24:38 +02:00
2008-07-15 21:55:59 +02:00
2008-08-20 12:36:03 +02:00
2008-07-22 14:35:57 +02:00
2008-04-26 17:35:47 +02:00
2008-04-17 17:41:37 +02:00
2008-05-25 10:55:11 +02:00
2008-07-18 18:51:57 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-08-21 10:01:52 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-08-20 11:52:15 +02:00
2008-07-22 14:35:57 +02:00
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
2008-10-06 18:17:07 +02:00
2008-07-09 07:43:28 +02:00
2008-08-15 08:35:42 -07:00
2008-07-14 15:28:10 -07:00
2008-09-23 10:31:26 +02:00
2008-07-15 21:55:59 +02:00
2008-07-14 16:11:52 +02:00