diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:25 +0200 |
| commit | f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /arch/arm/Kconfig | |
| parent | Merge branch 'swp' (early part) into for-next (diff) | |
| parent | Merge tag 'nommu-for-rmk' of git://git.pengutronix.de/git/ukl/linux into deve... (diff) | |
| download | linux-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.tar.xz linux-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'arch/arm/Kconfig')
0 files changed, 0 insertions, 0 deletions