diff options
| author | gjb <gjb@FreeBSD.org> | 2014-02-21 23:18:35 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-02-21 23:18:35 +0000 |
| commit | 38f5e1d44f3c0f789afc6d8d3ff00aa8c5522f30 (patch) | |
| tree | f97ec9870f850da3a64093d8ca1ce5cd109924a7 /release/arm | |
| parent | ac414654b33e4621cdb49e5b3020a09ad534e289 (diff) | |
| parent | 439e44a5a54827e8a89f39313ba696d61e76884e (diff) | |
| parent | 1ddd0febb6ea026d2b40a3e5da18a9910d06c7b4 (diff) | |
| parent | e4c42ecf1296b3d516f75e8c3b77f5a52c7b786e (diff) | |
| parent | 8ed76379b5a46f69f70b081018e7fdd1165d7731 (diff) | |
| parent | 418c2927d73a2044e2d31976989eed3a374ec6b5 (diff) | |
| download | FreeBSD-src-38f5e1d44f3c0f789afc6d8d3ff00aa8c5522f30.zip FreeBSD-src-38f5e1d44f3c0f789afc6d8d3ff00aa8c5522f30.tar.gz | |
Merge the following:
^/user/gjb/hacking/release-embedded:
259994,260000,260895-260896,261139,261152,
261174,261176,261210,261221,261237,261239,
261448,261489
^/user/gjb/release-embedded:
262305,262307
svn:mergeinfo is intentionally not included in the commit, so it does
not propagate to head/.
Sponsored by: The FreeBSD Foundation
