Home
last modified time | relevance | path

Searched hist:a1922ed661ab2c1637d0b10cde933bd9cd33d965 (Results 1 – 25 of 1890) sorted by relevance

12345678910>>...76

/linux/arch/mips/include/asm/octeon/
H A Dcvmx-helper-errata.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dcvmx-helper-jtag.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dcvmx-npi-defs.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/Documentation/ABI/testing/
H A Dsysfs-ppsdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/Documentation/trace/
H A Dfunction-graph-fold.vimdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/tools/perf/
H A DCREDITSdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/tools/perf/util/include/asm/
H A Dsystem.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/cavium-octeon/executive/
H A Dcvmx-helper-errata.cdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dcvmx-helper-jtag.cdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/include/asm/mach-cobalt/
H A Dirq.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/include/asm/
H A Damon.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dreg.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/sh/drivers/pci/
H A Dops-sh7786.cdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/drivers/md/
H A Ddm-log-userspace-transfer.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/include/asm/txx9/
H A Ddmac.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dtx4927.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/microblaze/include/asm/
H A Dmodule.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
H A Dtimex.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/cobalt/
H A Dbuttons.cdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/drivers/staging/octeon/
H A Dethernet-mem.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/drivers/pps/
H A Dsysfs.cdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/mips/power/
H A DMakefilediff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/drivers/misc/sgi-gru/
H A Dgrulib.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/arch/powerpc/include/asm/
H A Dmpc5xxx.hdiff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
/linux/samples/trace_events/
H A DMakefilediff a1922ed661ab2c1637d0b10cde933bd9cd33d965 Mon Sep 07 08:19:51 CEST 2009 Ingo Molnar <mingo@elte.hu> Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

12345678910>>...76