1
linux/include/asm-generic
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
..
bitops x86, generic: mark complex bitops.h inlines as __always_inline 2009-01-13 18:56:30 +01:00
4level-fixup.h
atomic.h
audit_change_attr.h
audit_dir_write.h
audit_read.h
audit_signal.h
audit_write.h
bitops.h
bug.h documentation: when to BUG(), and when to not BUG() 2009-01-06 15:59:13 -08:00
cmpxchg-local.h
cmpxchg.h
cputime.h
device.h
div64.h
dma-coherent.h
dma-mapping-broken.h
emergency-restart.h
errno-base.h
errno.h
fcntl.h make exported headers use strict posix types 2009-03-26 18:14:14 +01:00
futex.h
gpio.h gpiolib: allow GPIOs to be named 2009-04-02 19:04:51 -07:00
ide_iops.h
int-l64.h
int-ll64.h
ioctl.h
iomap.h
irq_regs.h
Kbuild
Kbuild.asm byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
kdebug.h
libata-portmap.h
local.h remove linux/hardirq.h from asm-generic/local.h 2009-01-06 15:59:13 -08:00
memory_model.h mm: remove CONFIG_OUT_OF_LINE_PFN_TO_PAGE 2009-01-06 15:59:10 -08:00
mm_hooks.h
mman.h
mutex-dec.h
mutex-null.h
mutex-xchg.h
page.h
pci-dma-compat.h
pci.h
percpu.h percpu: add optimized generic percpu accessors 2009-01-16 14:20:31 +01:00
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param 2009-01-13 19:13:01 +01:00
poll.h
resource.h
rtc.h alpha: fix RTC on marvel 2009-01-15 16:39:40 -08:00
sections.h x86: make percpu symbols zerobased on SMP 2009-01-16 14:19:14 +01:00
siginfo.h make exported headers use strict posix types 2009-03-26 18:14:14 +01:00
signal.h
statfs.h remove __KERNEL_STRICT_NAMES 2009-03-26 18:14:21 +01:00
syscall.h
termios.h
tlb.h
topology.h cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic 2009-03-30 22:05:17 +10:30
uaccess.h
vmlinux.lds.h Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
xor.h