diff options
| author | Russell King | 2012-03-27 12:30:31 +0200 |
|---|---|---|
| committer | Russell King | 2012-03-27 12:30:31 +0200 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/Makefile | |
| parent | Merge branches 'l2', 'pgt2' and 'misc' into for-linus (diff) | |
| parent | Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-b0df89868006517417251e02cc4ce5d4b0165885.tar.gz kernel-qcow2-linux-b0df89868006517417251e02cc4ce5d4b0165885.tar.xz kernel-qcow2-linux-b0df89868006517417251e02cc4ce5d4b0165885.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
0 files changed, 0 insertions, 0 deletions