| commit | b6f5f988b6c19d5326221c4edd82d7e3a892b9ad | [log] [tgz] |
|---|---|---|
| author | Avery Pennarun <apenwarr@gmail.com> | Tue Sep 23 15:16:51 2014 -0400 |
| committer | Avery Pennarun <apenwarr@gmail.com> | Tue Sep 23 15:16:51 2014 -0400 |
| tree | 77f712cf781685037fb3ad815546ade4ab6a7bff | |
| parent | 58959361429d99863dc92c582a40fe0e8f9d91b9 [diff] | |
| parent | 43a632cb16bc20726a8eb9cd8eda63ce94414ccf [diff] |
Merge remote-tracking branch 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak into newkernel_dev * 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak: Add newkernel_dev branch. Conflicts: default.xml