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
..
a.out-core.h
a.out.h
adb_iop.h
amigahw.h
amigaints.h
amigayle.h
amipcmcia.h
anchor.h
apollodma.h
apollohw.h
atafd.h
atafdreg.h
atari_joystick.h
atari_stdma.h
atari_stram.h
atarihw.h	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
atariints.h	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
atarikb.h
atomic.h
atomic_mm.h
atomic_no.h
auxvec.h
bitops.h
bitops_mm.h
bitops_no.h
blinken.h
bootinfo.h	m68k: use the mmu version of bootinfo.h for m68knommu as well	2009-03-24 15:17:44 +10:00
bootstd.h
bug.h	m68k: merge the mmu and non-mmu versions of bug.h	2009-03-24 15:17:44 +10:00
bugs.h	m68k: merge the mmu and non-mmu versions of bugs.h	2009-03-24 15:17:45 +10:00
bvme6000hw.h
byteorder.h	m68k{nommu}: fixups after the header move	2009-01-26 10:38:43 -08:00
cache.h	m68k: use the mmu version of cache.h for m68knommu as well	2009-03-24 15:17:44 +10:00
cachectl.h
cacheflush.h
cacheflush_mm.h
cacheflush_no.h	m68knommu: fix cache flushing for the 527x ColdFire processors	2009-01-27 16:42:00 +10:00
checksum.h
checksum_mm.h
checksum_no.h
coldfire.h
commproc.h
contregs.h
cputime.h
current.h	m68k: merge the mmu and non-mmu versions of current.h	2009-03-24 15:17:45 +10:00
dbg.h
delay.h
delay_mm.h
delay_no.h
device.h
div64.h	m68k: merge the mmu and non-mmu versions of div64.h	2009-03-24 15:17:45 +10:00
dma-mapping.h	m68k: swtich non-mmu setups to use the mmu dma-mapping.h	2009-03-24 15:17:41 +10:00
dma.h
dma_mm.h
dma_no.h
dsp56k.h
dvma.h
elf.h	m68k: use mmu version of elf.h for non-mmu builds as well	2009-03-24 15:17:42 +10:00
elia.h
emergency-restart.h
entry.h
entry_mm.h
entry_no.h
errno.h
fb.h	m68k: merge the mmu and non-mmu versions of fb.h	2009-03-24 15:17:44 +10:00
fbio.h
fcntl.h
flat.h
floppy.h
fpu.h	m68k: use mmu fpu.h for non-mmu builds as well	2009-03-24 15:17:42 +10:00
ftrace.h	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
futex.h
hardirq.h
hardirq_mm.h
hardirq_no.h
hp300hw.h
hw_irq.h	m68k: the one hw_irq.h can be used buy all m68k	2009-03-24 15:17:42 +10:00
hwtest.h
ide.h	ide: cleanup <asm-m68k/ide.h>	2009-03-27 12:46:23 +01:00
idprom.h
intersil.h
io.h
io_mm.h
io_no.h
ioctl.h
ioctls.h
ipcbuf.h
irq.h
irq_mm.h	m68k: irq_node.handler() should return irqreturn_t	2009-03-26 21:15:30 +01:00
irq_no.h
irq_regs.h
Kbuild	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2009-01-26 10:33:01 -08:00
kdebug.h
kmap_types.h	m68k: use mmu kmap_types.h for non-mmu setups as well	2009-03-24 15:17:41 +10:00
linkage.h
local.h
m520xsim.h
m523xsim.h
m527xsim.h
m528xsim.h
m532xsim.h	m68knommu: add missing interrupt line definition for UART 2	2009-03-24 15:17:45 +10:00
m5206sim.h
m5249sim.h
m5272sim.h
m5307sim.h
m5407sim.h
m68360.h
m68360_enet.h
m68360_pram.h
m68360_quicc.h
m68360_regs.h
mac_asc.h
mac_baboon.h
mac_iop.h
mac_mouse.h
mac_oss.h
mac_psc.h
mac_via.h
machdep.h
machdep_mm.h
machdep_no.h
machines.h
machw.h
macintosh.h	m68k: mac - Add a new entry in mac_model to identify the floppy controller type.	2009-03-26 21:15:27 +01:00
macints.h
math-emu.h
MC68EZ328.h
MC68VZ328.h
MC68328.h
MC68332.h
mc146818rtc.h	m68k: use the mc146818rtc.h for non-mmu setups as well.	2009-03-24 15:17:41 +10:00
mcfcache.h
mcfdma.h
mcfmbus.h
mcfne.h
mcfpit.h
mcfsim.h
mcfsmc.h
mcftimer.h
mcfuart.h
mcfwdebug.h
md.h
mman.h
mmu.h	m68k: merge the mmu and non-mmu versions of mmu.h	2009-03-24 15:17:42 +10:00
mmu_context.h	m68k: merge the mmu and non-mmu versions of mmu_context.h	2009-03-24 15:17:45 +10:00
mmzone.h
module.h	m68k: merge the mmu and non-mmu versions of module.h	2009-03-24 15:17:45 +10:00
motorola_pgalloc.h
motorola_pgtable.h
movs.h
msgbuf.h
mutex.h
mvme16xhw.h
mvme147hw.h
nettel.h
nubus.h
openprom.h
oplib.h
page.h
page_mm.h
page_no.h
page_offset.h	m68k: merge the mmu and non-mmu versions of page_offset.h	2009-03-24 15:17:43 +10:00
param.h	m68k: merge the non-MMU and MMU versions of param.h	2009-03-16 17:52:16 +10:00
parport.h
pci.h	m68k: use the mmu pci.h for m68knommu as well	2009-03-24 15:17:41 +10:00
percpu.h
pgalloc.h	m68k: merge the mmu and non-mmu versions of pgalloc.h	2009-03-24 15:17:43 +10:00
pgtable.h
pgtable_mm.h
pgtable_no.h	m68knommu: mv definition of check_pgt_cache()	2009-03-24 15:17:43 +10:00
poll.h
posix_types.h
processor.h
processor_mm.h
processor_no.h
ptrace.h	m68k: merge the non-MMU and MMU versions of ptrace.h	2009-03-17 08:44:42 +10:00
q40_master.h
q40ints.h
quicc_simple.h
raw_io.h
resource.h
rtc.h	m68k: Hook up rtc-generic	2009-04-02 01:05:31 +00:00
sbus.h
scatterlist.h	m68k: Use dma_addr_t for scatterlist.dma_address	2009-03-24 15:17:43 +10:00
sections.h
segment.h	m68k: merge the mmu and non-mmu versions of segment.h	2009-03-24 15:17:44 +10:00
sembuf.h
serial.h
setup.h	m68k: use MMU version of setup.h for both MMU and non-MMU	2009-03-17 08:44:41 +10:00
shm.h
shmbuf.h
shmparam.h
sigcontext.h	m68k: merge the non-MMU and MMU versions of sigcontext.h	2009-03-16 18:00:25 +10:00
siginfo.h	m68k: merge the non-MMU and MMU versions of siginfo.h	2009-03-17 08:47:11 +10:00
signal.h	m68k: merge the non-MMU and MMU versions of signal.h	2009-03-17 08:44:42 +10:00
smp.h
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h
spinlock.h
stat.h
statfs.h
string.h
string_mm.h
string_no.h
sun3-head.h
sun3_pgalloc.h
sun3_pgtable.h
sun3ints.h
sun3mmu.h
sun3x.h
sun3xflop.h
sun3xprom.h
suspend.h
swab.h	m68k: merge the non-MMU and MMU versions of swab.h	2009-03-16 17:54:49 +10:00
system.h
system_mm.h
system_no.h	m68knommu: remove obsolete and unused eLIA board	2009-01-27 16:42:02 +10:00
termbits.h
termios.h
thread_info.h
thread_info_mm.h
thread_info_no.h
timex.h	m68k: use mmu timex.h for non-mmu setups as well	2009-03-24 15:17:42 +10:00
tlb.h
tlbflush.h	m68k: merge the mmu and non-mmu versions of tlbflush.h	2009-03-24 15:17:45 +10:00
topology.h
traps.h
traps_mm.h
traps_no.h
types.h
uaccess.h
uaccess_mm.h
uaccess_no.h
ucontext.h	m68k: merge the mmu and non-mmu versions of ucontext.h	2009-03-24 15:17:43 +10:00
unaligned.h	m68k: Restore correct include guards for <asm/unaligned.h>	2009-03-24 15:17:43 +10:00
unistd.h	m68k: use the MMU version of unistd.h for all m68k platforms	2009-03-17 08:44:55 +10:00
user.h
virtconvert.h
xor.h
zorro.h