diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 21:25:41 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 21:25:41 (GMT) |
| commit | 5d3a0a95868a9669816da193bb284121df9031c8 (patch) | |
| tree | 292ce2c9135bd7b524b4710cff9a174c2967d600 /arch/arm/boot/dts/imx23.dtsi | |
| parent | 7e95c548818d2b311090848083277fb907cfb56d (diff) | |
| parent | b98138e00d96abc85b100c9b6886f105d9868ab5 (diff) | |
| download | linux-fsl-qoriq-5d3a0a95868a9669816da193bb284121df9031c8.tar.xz | |
Merge branch 'next/cleanup2' into HEAD
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
0 files changed, 0 insertions, 0 deletions