diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 22:59:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:02:30 +0200 |
| commit | d5cd8605e2814d268cddee1ff1d95d9010b4e8eb (patch) | |
| tree | 87f67a177b10ec6c9e6c023cabb1c3607efe20b5 /arch/arm/configs/ixp4xx_defconfig | |
| parent | Merge tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-st... (diff) | |
| parent | ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node (diff) | |
| download | linux-d5cd8605e2814d268cddee1ff1d95d9010b4e8eb.tar.xz linux-d5cd8605e2814d268cddee1ff1d95d9010b4e8eb.zip | |
Merge branch 'at91/cleanup' into next/dt
Conflicts:
arch/arm/boot/dts/at91sam9rl.dtsi
Needed as a dependency for the at91/dt2 branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/ixp4xx_defconfig')
0 files changed, 0 insertions, 0 deletions