diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:10:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:10:23 +0200 |
commit | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (patch) | |
tree | 5f60106dacbfe246f52aaaf9bac69dd4749f24a6 /arch/m68k/include/asm/mcfuart.h | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | perf/x86: Fix USER/KERNEL tagging of samples (diff) | |
download | linux-90574ebb7e6e0f7f74636ee87315890ba88d6a4a.tar.xz linux-90574ebb7e6e0f7f74636ee87315890ba88d6a4a.zip |
Merge branch 'perf/urgent' into perf/core
Merge this branch to pick up a fixlet and to update to a more recent base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m68k/include/asm/mcfuart.h')
0 files changed, 0 insertions, 0 deletions