tree 77f712cf781685037fb3ad815546ade4ab6a7bff
parent 58959361429d99863dc92c582a40fe0e8f9d91b9
parent 43a632cb16bc20726a8eb9cd8eda63ce94414ccf
author Avery Pennarun <apenwarr@gmail.com> 1411499811 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1411499811 -0400

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