Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits) tracing, net: fix net tree and tracing tree merge interaction tracing, powerpc: fix powerpc tree and tracing tree interaction ring-buffer: do not remove reader page from list on ring buffer free function-graph: allow unregistering twice trace: make argument 'mem' of trace_seq_putmem() const tracing: add missing 'extern' keywords to trace_output.h tracing: provide trace_seq_reserve() blktrace: print out BLK_TN_MESSAGE properly blktrace: extract duplidate code blktrace: fix memory leak when freeing struct blk_io_trace blktrace: fix blk_probes_ref chaos blktrace: make classic output more classic blktrace: fix off-by-one bug blktrace: fix the original blktrace blktrace: fix a race when creating blk_tree_root in debugfs blktrace: fix timestamp in binary output tracing, Text Edit Lock: cleanup tracing: filter fix for TRACE_EVENT_FORMAT events ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release() x86: kretprobe-booster interrupt emulation code fix ... Fix up trivial conflicts in arch/parisc/include/asm/ftrace.h include/linux/memory.h kernel/extable.c kernel/module.c		2009-04-05 11:04:19 -07:00
..
alchemy	MIPS: Alchemy: PB1200: use SMC91X platform data.	2009-03-30 14:49:46 +02:00
basler/excite	platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'	2009-03-24 16:38:25 -07:00
bcm47xx	MIPS: WGT634U: Add reset button support	2008-10-15 12:46:51 +01:00
boot	[MIPS] checkfiles: Fix "need space after that ','" errors.	2007-10-11 23:46:15 +01:00
cavium-octeon	MIPS: Convert obsolete irq_desc_t to struct irq_desc	2009-03-30 14:49:44 +02:00
cobalt	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
configs	MIPS: Mark Eins: Fix configuration.	2009-03-13 23:08:00 +01:00
dec	mips: use bcd2bin/bin2bcd	2008-10-20 08:52:41 -07:00
emma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
fw	[MIPS] Remove mips_machtype from ARC based machines	2008-07-15 18:44:38 +01:00
gt64120/wrppmc	[MIPS] remove wrppmc_machine_power_off()	2008-07-15 18:44:36 +01:00
include/asm	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
jazz	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
kernel	preadv/pwritev: MIPS: Add preadv(2) and pwritev(2) syscalls.	2009-04-02 19:05:08 -07:00
lasat	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
lemote/lm2e	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
lib	MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT	2009-01-30 21:32:58 +00:00
math-emu	MIPS: Switch FPU emulator trap to BREAK instruction.	2008-10-30 14:44:34 +00:00
mipssim	[MIPS] Remove TLB sanitation code	2008-04-28 17:14:25 +01:00
mm	mm: use debug_kmap_atomic	2009-04-01 08:59:14 -07:00
mti-malta	MIPS: Malta: make a needlessly global integer variable static	2009-03-30 14:49:45 +02:00
nxp	cpumask: convert struct clock_event_device to cpumask pointers.	2008-12-13 21:20:26 +10:30
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
pci	MIPS: RC32434: Define io_map_base for PCI controller	2009-01-30 21:32:59 +00:00
pmc-sierra	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
rb532	MIPS: RB532: Export rb532_gpio_set_func()	2009-01-30 21:33:01 +00:00
sgi-ip22	irq: update all arches for new irq_desc, fix	2009-01-15 11:15:36 +01:00
sgi-ip27	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
sgi-ip32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
sibyte	MIPS: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all platforms	2009-03-30 14:49:44 +02:00
sni	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
txx9	MIPS: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all platforms	2009-03-30 14:49:44 +02:00
vr41xx	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
Kconfig.debug	MIPS: Kconfig: Fix the arch-specific header path	2008-12-12 18:12:23 +00:00
Makefile	MIPS: Makefile: Add simple make install target.	2009-03-30 14:49:40 +02:00