| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms@verge.net.au> | Thu Nov 08 17:49:35 2012 +0900 |
| committer | Simon Horman <horms@verge.net.au> | Thu Nov 08 17:49:35 2012 +0900 |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 [diff] | |
| parent | 2944628607f76e4755660cd710f22a4748ef88d8 [diff] |
Merge branch 'soc' into boards Conflicts: arch/arm/configs/marzen_defconfig