aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-01-27 12:01:41 +0100
committerIngo Molnar <mingo@elte.hu>2012-01-27 12:01:43 +0100
commit801493c2e249a7314e9e8e54ad60d613d0a86f14 (patch)
treec8f77ce14e76abec848366812a0aad0fad4f539c /arch/frv
parentMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff)
parentMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff)
downloadlinux-dev-801493c2e249a7314e9e8e54ad60d613d0a86f14.tar.xz
linux-dev-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/frv')
0 files changed, 0 insertions, 0 deletions