Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ...

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c

2010-10-24 13:41:39 -07:00

..

blktrace.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ftrace.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

Kconfig

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-10-21 16:42:32 -07:00

Makefile

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 09:30:52 -07:00

power-traces.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ring_buffer_benchmark.c

ring-buffer: Make benchmark handle missed events

2010-04-27 13:26:58 -04:00

ring_buffer.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

trace_branch.c

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_clock.c

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 09:39:22 -07:00

trace_entries.h

tracing: Remove special traces

2010-07-20 14:31:07 +02:00

trace_event_perf.c

perf: Rework the PMU methods

2010-09-09 20:46:30 +02:00

trace_events_filter.c

tracing: Remove test of NULL define_fields callback

2010-06-28 17:12:52 -04:00

trace_events.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

trace_export.c

tracing: Remove redundant raw_init callbacks

2010-06-28 17:12:53 -04:00

trace_functions_graph.c

tracing: Remove parent recording in latency tracer graph options

2010-10-18 10:53:38 -04:00

trace_functions.c

tracing: Remove ftrace_preempt_disable/enable

2010-06-03 19:32:38 -04:00

trace_irqsoff.c

tracing: Use one prologue for the preempt irqs off tracer function tracers

2010-10-18 10:53:36 -04:00

trace_kdb.c

kdb,ftdump: Remove reference to internal kdb include

2010-10-22 15:34:11 -05:00

trace_kprobe.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

trace_mmiotrace.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

trace_nop.c

tracing/ftrace: make nop-tracer use polling wait for events on pipe

2009-03-23 09:22:15 +01:00

trace_output.c

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

2010-07-23 09:10:29 +02:00

trace_output.h

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00

trace_printk.c

tracing: Remove markers

2009-09-18 21:22:08 +02:00

trace_sched_switch.c

tracing: Let tracepoints have data passed to tracepoint callbacks

2010-05-14 09:50:34 -04:00

trace_sched_wakeup.c

tracing: Fix compile issue for trace_sched_wakeup.c

2010-10-19 10:56:19 -04:00

trace_selftest_dynamic.c

…

trace_selftest.c

tracing: Remove special traces

2010-07-20 14:31:07 +02:00

trace_stack.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

trace_stat.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

trace_stat.h

tracing/stat: Add stat_release() callback

2009-07-10 12:14:05 +02:00

trace_syscalls.c

tracing: Use a global field list for all syscall exit events

2010-06-28 17:12:44 -04:00

trace_workqueue.c

jump label: Initialize workqueue tracepoints *before* they are registered

2010-09-22 16:30:03 -04:00

trace.c

tracing/trivial: Remove cast from void*

2010-10-18 10:53:22 -04:00

trace.h

tracing: Make graph related irqs/preemptsoff functions global

2010-10-18 10:53:28 -04:00