| commit | fd2e1dd7bb2e4f19e063aff9194b795be8510464 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Nov 12 21:57:52 2012 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Nov 12 21:57:52 2012 +0100 |
| tree | f3f94c341531014a3e2cd175984c553671458ea1 | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 [diff] | |
| parent | ab6f6d85210c4d0265cf48e9958c04e08595055a [diff] | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 [diff] | |
| parent | 86bc52ef4373be64867b56f3a9e30cbabf64e0dd [diff] |
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 These are all dependencies for the renesas/boards2 branch. Conflicts: arch/arm/configs/marzen_defconfig