]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdfc09e b90c4b9)
Merge remote-tracking branch 'arm-perf/for-next/perf'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:27:50 +0000 (09:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:27:50 +0000 (09:27 +1100)
Conflicts:
arch/arm/kernel/hw_breakpoint.c
arch/arm/mach-bcmring/arch.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c


Trivial merge
Linux kernel for KaRo TX COM modules