diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
| commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
| tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /arch/arm/mach-kirkwood/ts41x-setup.c | |
| parent | Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: EXYNOS4: Implement Clock gating for System MMU (diff) | |
| download | linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.xz linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-kirkwood/ts41x-setup.c')
0 files changed, 0 insertions, 0 deletions