diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 23:40:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 23:40:37 +0100 |
| commit | 7cc026f21e2acdcea8640df5da470c6fdca92911 (patch) | |
| tree | 6f3caa790f02378868876ad3d78203680e9372e7 /arch/arm/mach-pxa/pxa3xx.c | |
| parent | Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE (diff) | |
| download | linux-7cc026f21e2acdcea8640df5da470c6fdca92911.tar.xz linux-7cc026f21e2acdcea8640df5da470c6fdca92911.zip | |
Merge branch 'imx/defconfig' into next/drivers
Conflicts:
arch/arm/configs/imx_v6_v7_defconfig
Resolves one conflict with an earlier branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
0 files changed, 0 insertions, 0 deletions