diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 22:47:48 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 22:47:48 +0200 |
| commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/mach-at91/board-cpu9krea.c | |
| parent | Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinc... (diff) | |
| parent | Merge branch 'dev/removing-s5p6442' into for-next (diff) | |
| download | linux-586893ebc42943008010b4c210cfc9167df615e5.tar.xz linux-586893ebc42943008010b4c210cfc9167df615e5.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'arch/arm/mach-at91/board-cpu9krea.c')
0 files changed, 0 insertions, 0 deletions