OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/xtensa/include/asm
History
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
..
Kbuild byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
asmmacro.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
atomic.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2009-01-07 11:56:29 -08:00
auxvec.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
bitops.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2009-01-07 11:56:29 -08:00
bootparam.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
bug.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
bugs.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
byteorder.h byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
cache.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
cacheasm.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
cacheflush.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
checksum.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
coprocessor.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
cpumask.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
cputime.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
current.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
delay.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
device.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
div64.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
dma-mapping.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
dma.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
elf.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
emergency-restart.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
errno.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
fb.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
fcntl.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
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 xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
gpio.h xtensa: s6000 variant 2009-04-02 23:43:36 -07:00
hardirq.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
highmem.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
hw_irq.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
io.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ioctl.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
ioctls.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
ipcbuf.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
irq.h xtensa: variant irq set callbacks 2009-04-02 23:43:01 -07:00
irq_regs.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
kdebug.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
kmap_types.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
linkage.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
local.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mman.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mmu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
mmu_context.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
module.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
msgbuf.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mutex.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
nommu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
nommu_context.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 xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
pci-bridge.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
pci.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
percpu.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
pgalloc.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
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 xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
posix_types.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
processor.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ptrace.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
regs.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
resource.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
rmap.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
rwsem.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
scatterlist.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
sections.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
segment.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
sembuf.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
serial.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
setup.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
shmbuf.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
shmparam.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
sigcontext.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
siginfo.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
signal.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
smp.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
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 xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
spinlock.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
stat.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
statfs.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
string.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
swab.h headers_check fix: xtensa, swab.h 2009-02-01 11:01:30 +05:30
syscall.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
system.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
termbits.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
termios.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
thread_info.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
timex.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
tlb.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
tlbflush.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
topology.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
types.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
uaccess.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
ucontext.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
unaligned.h xtensa: switch to packed struct unaligned access implementation 2008-11-11 06:14:10 -08:00
unistd.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
user.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
vga.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
xor.h xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00