Changes in CREDITS

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/tools/perf/CREDITS

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 07:06:28 +0100

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/tools/perf/CREDITS

907bc6c7fc7071b00083fc11e510e47dd93df45d - Merge branch 'for-2.6.32' into for-2.6.33

Tue, 06 Oct 2009 17:01:27 +0200

Merge branch 'for-2.6.32' into for-2.6.33 List of files: /linux/tools/perf/CREDITS

f056878332a91ed984a116bad4e7d49aefff9e6e - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Wed, 23 Sep 2009 01:49:27 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Conflicts: drivers/power/wm97xx_battery.c List of files: /linux/tools/perf/CREDITS

fc8e1ead9314cf0e0f1922e661428b93d3a50d88 - Merge branch 'next' into for-linus

Mon, 14 Sep 2009 06:16:56 +0200

Merge branch 'next' into for-linus List of files: /linux/tools/perf/CREDITS

cf7a2b4fb6a9b86779930a0a123b0df41aa9208f - Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel

Sat, 12 Sep 2009 13:01:34 +0200

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel List of files: /linux/tools/perf/CREDITS

9134d02bc0af4a8747d448d1f811ec5f8eb96df6 - Merge commit 'md/for-linus' into async-tx-next

Wed, 09 Sep 2009 02:55:54 +0200

Merge commit 'md/for-linus' into async-tx-nextConflicts: drivers/md/raid5.c List of files: /linux/tools/perf/CREDITS

a1922ed661ab2c1637d0b10cde933bd9cd33d965 - Merge branch 'tracing/core' into tracing/hw-breakpoints

Mon, 07 Sep 2009 08:19:51 +0200

Merge branch 'tracing/core' into tracing/hw-breakpointsConflicts: arch/Kconfig kernel/trace/trace.hMerge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs.Signed-off-by: Ingo Molnar List of files: /linux/tools/perf/CREDITS

8a517c514d5893602cf85c1b4c47afbbc04d2198 - Merge commit 'v2.6.31-rc7' into x86/cpu

Sun, 23 Aug 2009 11:18:47 +0200

Merge commit 'v2.6.31-rc7' into x86/cpu List of files: /linux/tools/perf/CREDITS

e9dc122166b8d863d3057a66ada04838e5548e52 - Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming

Fri, 21 Aug 2009 17:27:29 +0200

Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incomingConflicts: net/sunrpc/cache.c List of files: /linux/tools/perf/CREDITS

fa08661af834875c9bd6f7f0b1b9388dc72a6585 - Merge commit 'v2.6.31-rc6' into core/rcu

Sat, 15 Aug 2009 18:55:58 +0200

Merge commit 'v2.6.31-rc6' into core/rcuMerge reason: the branch was on pre-rc1 .30, update to latest.Signed-off-by: Ingo Molnar List of files: /linux/tools/perf/CREDITS

f222e8b40f2177b1c4cac015b117744c1d3fa3e9 - Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Mon, 10 Aug 2009 06:29:47 +0200

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ List of files: /linux/tools/perf/CREDITS

bd072111e7319d90a7b8127f91c2806b9a6f279e - Merge commit 'v2.6.31-rc4' into next

Thu, 23 Jul 2009 06:47:29 +0200

Merge commit 'v2.6.31-rc4' into next List of files: /linux/tools/perf/CREDITS

5304d5fc74a269cc6c3e70f9713684ca729abdf0 - Merge branch 'linus' into sched/core

Sat, 18 Jul 2009 15:50:22 +0200

Merge branch 'linus' into sched/coreMerge reason: branch had an old upstream base (-rc1-ish), but also merge to avoid a conflict.Signed-off-by: Ingo Molnar List of files: /linux/tools/perf/CREDITS

45bceffc3013bda7d2ebc7802e9b153b674e2d44 - Merge branch 'linus' into tracing/core

Sat, 18 Jul 2009 12:19:57 +0200

Merge branch 'linus' into tracing/coreMerge reason: tracing/core was on an older, pre-rc1 base.Signed-off-by: Ingo Molnar List of files: /linux/tools/perf/CREDITS

debc6a6927dcd833a30750b07a4c2b456b71f1be - Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

Tue, 14 Jul 2009 15:20:44 +0200

Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/coreConflicts: drivers/oprofile/oprofile_stats.c drivers/usb/otg/Kconfig drivers/usb/otg/MakefileSigned-off-by: Robert Richter List of files: /linux/tools/perf/CREDITS

7d45ecafb6792ca68da9517969d37d910601845f - Merge branch 'master' into next

Mon, 13 Jul 2009 16:30:40 +0200

Merge branch 'master' into nextConflicts: include/linux/personality.hUse Linus' version.Signed-off-by: James Morris List of files: /linux/tools/perf/CREDITS

d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84 - Merge branch 'linus' into x86/cleanups

Sat, 04 Jul 2009 11:00:38 +0200

Merge branch 'linus' into x86/cleanupsMerge reason: We were on an older pre-rc1 base, move to almost-rc2.Signed-off-by: Ingo Molnar List of files: /linux/tools/perf/CREDITS

c43768cbb7655ea5ff782ae250f6e2ef4297cf98 - Merge branch 'master' into for-next

Sat, 04 Jul 2009 00:13:18 +0200

Merge branch 'master' into for-nextPull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fixchanges. As alpha in percpu tree uses 'weak' attribute instead ofinline assembly, there's no need for __used attribute.Conflicts: arch/alpha/include/asm/percpu.h arch/mn10300/kernel/vmlinux.lds.S include/linux/percpu-defs.h List of files: /linux/tools/perf/CREDITS

55bcab46955644d5a8149a9b3cc9752a336e02f8 - Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Wed, 01 Jul 2009 04:02:59 +0200

Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (47 commits) perf report: Add --symbols parameter perf report: Add --comms parameter perf report: Add --dsos parameter perf_counter tools: Adjust only prelinked symbol's addresses perf_counter: Provide a way to enable counters on exec perf_counter tools: Reduce perf stat measurement overhead/skew perf stat: Use percentages for scaling output perf_counter, x86: Update x86_pmu after WARN() perf stat: Micro-optimize the code: memcpy is only required if no event is selected and !null_run perf stat: Improve output perf stat: Fix multi-run stats perf stat: Add -n/--null option to run without counters perf_counter tools: Remove dead code perf_counter: Complete counter swap perf report: Print sorted callchains per histogram entries perf_counter tools: Prepare a small callchain framework perf record: Fix unhandled io return value perf_counter tools: Add alias for 'l1d' and 'l1i' perf-report: Add bare minimum PERF_EVENT_READ parsing perf-report: Add modes for inherited stats and no-samples ... List of files: /linux/tools/perf/CREDITS