diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:31:38 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:31:38 +0200 |
| commit | 4d09a938861ef16248334d57ae250e109b0004ae (patch) | |
| tree | 60cf70a92cfbb0202779fcdb9360c1450a3cd238 /arch/arm/Kconfig | |
| parent | 93e85d8e902e1a4468c6ade5c6ec3dd3055a489f (diff) | |
| parent | 8bb2c4813c534d26eba3beb7888fbd3cbc931f62 (diff) | |
| parent | 1459fc5f6d244b4e43690df5e9e28e8de390caf0 (diff) | |
| parent | 1c72f9eaa53e920f142f4c1d20b4fc82b1a10ed5 (diff) | |
| parent | e04eb14fd28ab044a48fd0a71e8c9117087176fb (diff) | |
| parent | 681e6edc25a452e26e263386caaa4afb02b5f131 (diff) | |
| parent | fc5070b527b8243e9f4369e4e79ab431a5a1cb79 (diff) | |
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel