diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:24:41 +0100 |
| commit | ccfa8b21f20099b950b4f2f75d2330fb149a2012 (patch) | |
| tree | 60380e1417830f50683c3945e2fb9ee110418cbb /arch/arm/boot/dts/imx6q.dtsi | |
| parent | 7e0cac630c7c90f12a78131df9913657fa30243b (diff) | |
| parent | f350b86121c7a004a5f866333fa1d23fe30263a6 (diff) | |
Merge branch 'cross-platform/debug_ll' into imx/imx6q
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'arch/arm/boot/dts/imx6q.dtsi')
0 files changed, 0 insertions, 0 deletions