From: Linus Torvalds Date: Tue, 26 Feb 2008 15:44:09 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 X-Git-Tag: v2.6.25-rc4~159 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c811e4b6af424c295e3c6438fdc9b647fe6595f;p=platform%2Fkernel%2Flinux-3.10.git Merge git://git./linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (24 commits) x86: no robust/pi futex for real i386 CPUs x86: fix boot failure on 486 due to TSC breakage x86: fix build on non-C locales. x86: make c_idle.work have a static address. x86: don't save unreliable stack trace entries x86: don't make swapper_pg_pmd global x86: don't print a warning when MTRR are blank and running in KVM x86: fix execve with -fstack-protect x86: fix vsyscall wreckage x86: rename KERNEL_TEXT_SIZE => KERNEL_IMAGE_SIZE x86: fix spontaneous reboot with allyesconfig bzImage x86: remove double-checking empty zero pages debug x86: notsc is ignored on common configurations x86/mtrr: fix kernel-doc missing notation x86: handle BIOSes which terminate e820 with CF=1 and no SMAP x86: add comments for NOPs x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC x86: require family >= 6 if we are using P6 NOPs x86: do not promote TM3x00/TM5x00 to i686-class x86: hpet fix docbook comment ... --- 7c811e4b6af424c295e3c6438fdc9b647fe6595f