diff options
author | 2010-06-27 08:18:20 -0700 | |
---|---|---|
committer | 2010-06-27 08:18:20 -0700 | |
commit | bf2937695fe2330bfd8933a2310e7bdd2581dc2e (patch) | |
tree | 66286a4ae2bf4d5c317e7270b92effa570e7f1d7 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
parent | clocksource: sh_cmt: Fix up bogus shift value. (diff) | |
download | linux-dev-bf2937695fe2330bfd8933a2310e7bdd2581dc2e.tar.xz linux-dev-bf2937695fe2330bfd8933a2310e7bdd2581dc2e.zip |
Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
clocksource: sh_cmt: Fix up bogus shift value.
arch/sh/mm: Eliminate a double lock
sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
sh: remove duplicated #include
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions