diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 00:09:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 00:09:14 +0100 |
| commit | e067096c8d57d191f29d734cd5692695c95cc36e (patch) | |
| tree | e1c200404c3ed3730d04837113d59ca898eb483a /arch/arm/mach-s3c64xx/Kconfig | |
| parent | Merge branch 'imx/board' into next/boards (diff) | |
| parent | Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/o... (diff) | |
| download | linux-e067096c8d57d191f29d734cd5692695c95cc36e.tar.xz linux-e067096c8d57d191f29d734cd5692695c95cc36e.zip | |
Merge branch 'tegra/soc' into next/boards
Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c
To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
0 files changed, 0 insertions, 0 deletions