Linus Torvalds b0f4b285d7 Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits) sched, trace: update trace_sched_wakeup() tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3 Revert "x86: disable X86_PTRACE_BTS" ring-buffer: prevent false positive warning ring-buffer: fix dangling commit race ftrace: enable format arguments checking x86, bts: memory accounting x86, bts: add fork and exit handling ftrace: introduce tracing_reset_online_cpus() helper tracing: fix warnings in kernel/trace/trace_sched_switch.c tracing: fix warning in kernel/trace/trace.c tracing/ring-buffer: remove unused ring_buffer size trace: fix task state printout ftrace: add not to regex on filtering functions trace: better use of stack_trace_enabled for boot up code trace: add a way to enable or disable the stack tracer x86: entry_64 - introduce FTRACE_ frame macro v2 tracing/ftrace: add the printk-msg-only option tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp() x86, bts: correctly report invalid bts records ... Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits being already partly merged by the SH merge.		2008-12-28 12:21:10 -08:00
..
accessibility
acpi	Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core	2008-12-25 13:11:00 +01:00
amba
ata	pata_hpt366: no ATAPI DMA	2008-12-16 05:40:34 -05:00
atm	ATM: horizon, fix hrz_probe fail path	2008-11-29 20:42:28 -08:00
auxdisplay
base	sysfs: Fix return values for sysdev_store_{ulong,int}	2008-10-29 15:03:49 -07:00
block	Merge branch 'next' into for-linus	2008-12-25 11:40:09 +11:00
bluetooth	bpa10x: free sk_buff with kfree_skb	2008-10-31 00:40:19 -07:00
cdrom	Commands needing to be retried require a complete re-initialization.	2008-12-12 16:04:26 +01:00
char	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-28 12:21:10 -08:00
clocksource	Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus	2008-10-20 13:14:06 +02:00
connector	CRED: Use RCU to access another task's creds and to release a task's own creds	2008-11-14 10:39:19 +11:00
cpufreq
cpuidle	regression: disable timer peek-ahead for 2.6.28	2008-11-09 16:28:42 -08:00
crypto	crypto: talitos - Ack done interrupt in isr instead of tasklet	2008-12-25 11:02:33 +11:00
dca	[4/4] dca: fixup initialization dependency	2008-11-10 15:01:03 -08:00
dio
dma	async_xor: dma_map destination DMA_BIDIRECTIONAL	2008-12-08 13:46:00 -07:00
edac	edac: fix edac core deadlock when removing a device	2008-12-23 15:58:21 -08:00
eisa
firewire	firewire: fw-ohci: fix IOMMU resource exhaustion	2008-12-10 12:45:34 +01:00
firmware	Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core	2008-12-23 16:27:23 +01:00
gpio	gpiolib: extend gpio label column width in debugfs file	2008-11-19 18:49:57 -08:00
gpu	drm/radeon: fix correctness of irq_enabled check for radeon.	2008-12-23 10:50:12 +10:00
hid	HID: Apple ALU wireless keyboards are bluetooth devices	2008-11-28 15:09:26 +01:00
hwmon	hwmon: applesmc: make applesmc load automatically on startup	2008-12-01 19:55:24 -08:00
i2c	sh: sh_mobile i2c clock framework support	2008-12-22 18:42:51 +09:00
ide	drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test	2008-12-22 23:05:06 +01:00
idle	i7300_idle: Kconfig, show menu only on x86_64	2008-10-28 00:14:47 -04:00
ieee1394	ieee1394: add quirk fix for Freecom HDD	2008-12-14 01:13:13 +01:00
infiniband	Merge branches 'ehca' and 'mlx4' into for-linus	2008-12-01 10:11:50 -08:00
input	sh: sh_mobile keysc clock framework support	2008-12-22 18:42:51 +09:00
isdn	Merge branch 'next' into for-linus	2008-12-25 11:40:09 +11:00
leds	remove unused #include <version.h>'s	2008-11-01 09:50:12 -07:00
lguest
macintosh	rackmeter section fixes	2008-11-30 10:03:37 -08:00
mca
md	Merge branch 'linus' into tracing/hw-branch-tracing	2008-12-24 21:08:26 +01:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-12-28 11:39:19 -08:00
memstick	[PATCH] switch memstick	2008-10-21 07:48:33 -04:00
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2008-12-19 11:37:23 -08:00
mfd	mfd: Correct WM8350 I2C return code usage	2008-11-16 19:58:47 +01:00
misc	sgi-xp: xpc needs to pass the physical address, not virtual	2008-12-16 23:04:24 +01:00
mmc	mmc: struct device - replace bus_id with dev_name(), dev_set_name()	2008-11-08 21:37:46 +01:00
mtd	Merge git://git.infradead.org/mtd-2.6	2008-12-09 08:28:36 -08:00
net	Merge branch 'next' into for-linus	2008-12-25 11:40:09 +11:00
nubus
of	OF-device: Don't overwrite numa_node in device registration	2008-10-31 16:12:01 +11:00
oprofile	oprofile: fix memory ordering	2008-10-27 19:15:41 +01:00
parisc	[PATCH] introduce fmode_t, do annotations	2008-10-21 07:47:06 -04:00
parport	parport_serial: fix array overflow	2008-12-01 19:55:24 -08:00
pci	Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core	2008-12-23 16:27:23 +01:00
pcmcia	pcmcia: blackfin: fix bug - add missing ; to MODULE macro	2008-12-15 16:27:06 -08:00
pnp	drivers: remove duplicated #include	2008-11-04 08:18:19 -08:00
power	Merge git://git.infradead.org/battery-2.6	2008-10-20 09:44:30 -07:00
ps3	powerpc/ps3: Fix compile error in ps3-lpm.c	2008-11-05 19:59:08 +11:00
rapidio	rapidio section noise	2008-11-30 10:03:37 -08:00
regulator	regulator: Use menuconfig in Kconfig	2008-11-09 14:49:23 +00:00
rtc	rtc: rtc-isl1208: reject invalid dates	2008-12-23 15:58:21 -08:00
s390	[SCSI] zfcp: prevent double decrement on host_busy while being busy	2008-12-01 10:18:20 -06:00
sbus	Revert "of_platform_driver noise on sparce"	2008-12-01 07:55:14 -08:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6	2008-12-19 11:37:23 -08:00
serial	serial: sh-sci: Fix up port pinmux for SH7366.	2008-12-22 18:44:49 +09:00
sh	sh: maple: Do not pass SLAB_POISON to kmem_cache_create()	2008-12-16 16:40:32 +09:00
sn
spi	spi: fix spi_s3c24xx_gpio num_chipselect	2008-12-01 19:55:24 -08:00
ssb	SSB: hide empty sub menu	2008-11-10 13:50:17 -08:00
staging	STAGING: Move staging drivers back to staging-specific menu	2008-12-17 11:23:07 -08:00
tc
telephony	telephony: trivial: fix up email address	2008-11-11 09:30:23 -08:00
thermal
uio	saner FASYNC handling on file close	2008-11-01 09:49:46 -07:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2008-12-28 11:43:54 -08:00
uwb	uwb: wrong sizeof argument in mac address compare	2008-10-20 14:37:53 +01:00
video	video: sh_mobile_lcdcfb deferred io support	2008-12-22 18:44:48 +09:00
virtio
w1	w1: fix slave selection on big-endian systems	2008-12-23 15:58:21 -08:00
watchdog	iTCO_wdt: fix typo when setting TCO_EN bit	2008-12-03 16:20:19 -08:00
xen	xen: clean up asm/xen/hypervisor.h	2008-12-16 21:50:31 +01:00
zorro
Kconfig	regulator: Build on non-ARM platforms	2008-10-28 21:47:17 +00:00
Makefile	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2008-10-26 16:35:46 -07:00