Linus Torvalds 92b29b86fe Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits) tracing/fastboot: improve help text tracing/stacktrace: improve help text tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix bootgraph.pl initcall name regexp tracing/fastboot: fix issues and improve output of bootgraph.pl tracepoints: synchronize unregister static inline tracepoints: tracepoint_synchronize_unregister() ftrace: make ftrace_test_p6nop disassembler-friendly markers: fix synchronize marker unregister static inline tracing/fastboot: add better resolution to initcall debug/tracing trace: add build-time check to avoid overrunning hex buffer ftrace: fix hex output mode of ftrace tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix printk format typo in boot tracer ftrace: return an error when setting a nonexistent tracer ftrace: make some tracers reentrant ring-buffer: make reentrant ring-buffer: move page indexes into page headers tracing/fastboot: only trace non-module initcalls ftrace: move pc counter in irqtrace ... Manually fix conflicts: - init/main.c: initcall tracing - kernel/module.c: verbose level vs tracepoints - scripts/bootgraph.pl: fallout from cherry-picking commits.		2008-10-20 13:35:07 -07:00
..
boot	fbdev: ignore VESA modes if framebuffer does not support them	2008-10-16 11:21:45 -07:00
configs	x86: remove irqbalance in kernel for 32 bit	2008-10-16 16:52:52 +02:00
crypto	crypto: crc32c - Use Intel CRC32 instruction	2008-08-29 15:49:50 +10:00
ia32	compat: generic compat get/settimeofday	2008-10-16 11:21:33 -07:00
kernel	Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:35:07 -07:00
kvm	Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-10-16 15:36:00 -07:00
lguest	x86: make 32bit support per_cpu vector	2008-10-16 16:52:53 +02:00
lib	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
mach-default	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
mach-generic	x86: make 32bit support per_cpu vector	2008-10-16 16:52:53 +02:00
mach-rdc321x	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
mach-voyager	generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_desc[]	2008-10-16 16:52:29 +02:00
math-emu	x86: coding style fixes to arch/x86/math-emu/reg_constant	2008-06-18 15:00:13 +02:00
mm	Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:35:07 -07:00
oprofile	Merge branch 'linus' into oprofile-v2	2008-10-13 11:05:51 +02:00
pci	Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4	2008-10-13 14:18:42 +02:00
power	Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D	2008-10-11 20:23:20 +02:00
vdso	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
video	x86: video/fbdev.c: add MODULE_LICENSE	2008-05-04 20:04:46 +02:00
xen	Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:23:01 -07:00
Kconfig	Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:35:07 -07:00
Kconfig.cpu	x86: adjust dependencies for CONFIG_X86_CMOV	2008-10-13 10:33:50 +02:00
Kconfig.debug	x86: usb debug port early console, fix	2008-07-26 17:32:30 +02:00
Makefile	x86, RDC321x: add to mach-default	2008-07-26 13:51:46 +02:00
Makefile_32.cpu	x86: merge winchip-2 and winchip-2a cpu choices	2008-10-13 10:22:48 +02:00