diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-01-27 12:01:41 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-27 12:01:43 +0100 |
commit | 801493c2e249a7314e9e8e54ad60d613d0a86f14 (patch) | |
tree | c8f77ce14e76abec848366812a0aad0fad4f539c /arch/arm/mach-omap2/board-rx51.c | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-801493c2e249a7314e9e8e54ad60d613d0a86f14.tar.xz linux-801493c2e249a7314e9e8e54ad60d613d0a86f14.zip |
Merge branch 'linus' into perf/core
Merge reason: pick up fixes that are upstream, we need them
because we'll apply dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
0 files changed, 0 insertions, 0 deletions