| commit | ccfa8b21f20099b950b4f2f75d2330fb149a2012 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:24:41 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:24:41 2011 +0100 |
| tree | 60380e1417830f50683c3945e2fb9ee110418cbb | |
| parent | 7e0cac630c7c90f12a78131df9913657fa30243b [diff] | |
| parent | f350b86121c7a004a5f866333fa1d23fe30263a6 [diff] |
Merge branch 'cross-platform/debug_ll' into imx/imx6q Conflicts: arch/arm/Kconfig.debug