diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-16 23:39:53 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-16 23:39:53 -0400 |
| commit | 58a7ec89680147a0c0382257d1ce32ab4cb0d411 (patch) | |
| tree | f70fc3d6ad881fdc7e3a32b5e0ecaeeb1615bd13 | |
| parent | f469461df6ff822f71b8737bda86eea20f16ff93 (diff) | |
| parent | 414a0eacb8cd05b9efae24302d6a49d59b55baf4 (diff) | |
| parent | 1d4a8e2cf70c99a43e0de549b81e823194c1b1c4 (diff) | |
| parent | e69edc7939abda1f696c482faa8168d80420f75c (diff) | |
Merge remote branches 'origin', 'rmk/devel', 'willd/for-linaro' and 'ukl/arm/booting'
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/setup.c