| commit | 9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a | [log] [tgz] |
|---|---|---|
| author | Jason Cooper <jason@lakedaemon.net> | Wed Nov 21 20:00:36 2012 +0000 |
| committer | Jason Cooper <jason@lakedaemon.net> | Wed Nov 21 20:00:36 2012 +0000 |
| tree | 3fe6ef056f167c4502e2f6b7d193a63dc1a8c4f2 | |
| parent | 98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c [diff] | |
| parent | 8dc40c19efad15f5bdb77b8d1ccf902902c00c58 [diff] |
Merge tag 'marvell-net-xor-defconfig-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell mvebu defconfig updates for 3.8 Conflicts: arch/arm/configs/mvebu_defconfig