linux/arch/xtensa/include/asm
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
..
asmmacro.h
atomic.h
auxvec.h
bitops.h
bootparam.h
bug.h
bugs.h
byteorder.h byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
cache.h
cacheasm.h
cacheflush.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
checksum.h
coprocessor.h
cpumask.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
flat.h xtensa: add flat support 2009-04-02 23:41:29 -07:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h
gpio.h xtensa: s6000 variant 2009-04-02 23:43:36 -07:00
hardirq.h
highmem.h
hw_irq.h
io.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h xtensa: variant irq set callbacks 2009-04-02 23:43:01 -07:00
Kbuild byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
kdebug.h
kmap_types.h
linkage.h
local.h
mman.h
mmu_context.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
mmu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
module.h
msgbuf.h
mutex.h
nommu_context.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
nommu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
page.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
param.h
pci-bridge.h
pci.h
percpu.h
pgalloc.h
pgtable.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
platform.h xtensa: remove platform rtc hooks 2009-04-02 23:45:07 -07:00
poll.h
posix_types.h
processor.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ptrace.h
regs.h
resource.h
rmap.h
rwsem.h
scatterlist.h
sections.h
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
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
swab.h headers_check fix: xtensa, swab.h 2009-02-01 11:01:30 +05:30
syscall.h
system.h
termbits.h
termios.h
thread_info.h
timex.h
tlb.h
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h
user.h
vga.h
xor.h