| commit | 5d3a0a95868a9669816da193bb284121df9031c8 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:25:41 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:25:41 2012 -0700 |
| tree | 292ce2c9135bd7b524b4710cff9a174c2967d600 | |
| parent | 7e95c548818d2b311090848083277fb907cfb56d [diff] | |
| parent | b98138e00d96abc85b100c9b6886f105d9868ab5 [diff] |
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