| commit | 5a9f4fe9c869134083c52b8776f59db163b12c98 | [log] [tgz] |
|---|---|---|
| author | Avery Pennarun <apenwarr@gmail.com> | Thu Oct 30 19:56:00 2014 -0400 |
| committer | Avery Pennarun <apenwarr@gmail.com> | Thu Oct 30 19:56:00 2014 -0400 |
| tree | e13df879f71ac12de989d00c5ff3d4242ac8af3e | |
| parent | 01141f15aea0c7f9132019b538657f20021b89dd [diff] | |
| parent | bc607107107f6fbb50565eca015599c6515a7482 [diff] |
Merge remote-tracking branch 'origin/master' into HEAD * origin/master: Add new repo backports. Add kernel/bruno newkernel_dev branch to a new directory. Add hostap repo. Conflicts: default.xml Change-Id: I67d9ecbaeb671582e00f267a183d3278f2ccc090