summaryrefslogtreecommitdiffstats
path: root/sys/conf
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-08-121-1/+1
|\
| * Release 6 errata notices for 10.3-RELEASE, all related to Microsoft Hyper-V.glebius2016-08-121-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-07-261-1/+1
|\ \ | |/
| * Fix bspatch heap overflow vulnerability. [SA-16:25]delphij2016-07-251-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-06-061-1/+1
|\ \ | |/
| * Fix multiple ntp vulnerabilities.delphij2016-06-041-1/+1
| * Fix kernel stack disclosure in Linux compatibility layer. [SA-16:20]glebius2016-05-311-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-05-171-1/+1
|\ \ | |/
| * - Use unsigned version of min() when handling arguments of SETFKEY ioctl.glebius2016-05-171-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-05-041-1/+1
|\ \ | |/
| * Fix multiple OpenSSL vulnerabilitites. [SA-16:17]delphij2016-05-041-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-05-031-1/+1
|\ \ | |/
| * Fix ntp multiple vulnerabilities.delphij2016-04-291-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-03-251-1/+1
|\ \ | |/
| * Update releng/10.3 to -RELEASE status in preparation for the finalmarius2016-03-251-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-03-181-1/+1
|\ \ | |/
| * Update releng/10.3 to RC3 in preparation for 10.3-RC3 builds.marius2016-03-181-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-03-111-1/+1
|\ \ | |/
| * Update releng/10.3 to RC2 in preparation for 10.3-RC2 builds.marius2016-03-111-1/+1
* | Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2016-03-041-1/+1
|\ \ | |/
| * - Copy stable/10@296371 to releng/10.3 in preparation for 10.3-RC1marius2016-03-041-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-281-1/+1
|\ \ | |/
| * Update stable/10 to BETA3 in preparation for 10.3-BETA3 builds.marius2016-02-261-1/+1
* | Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"Renato Botelho2016-02-222-46/+2
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-192-0/+2
|\ \ | |/
| * MFC [Hyper-V]: r293719-r293722, r293869-r293871, r293873-r293875, r293877sephe2016-02-192-0/+2
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-132-1/+3
|\ \ | |/
| * Update stable/10 to BETA2 in preparation for 10.3-BETA2 builds.marius2016-02-121-1/+1
| * MFC r292674sbruno2016-02-111-0/+2
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-092-96/+71
|\ \ | |/
| * MFC r294915:hselasky2016-02-062-96/+71
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-051-1/+1
|\ \ | |/
| * Update stable/10 to BETA1 in preparation for 10.3-BETA1 builds, take 2.marius2016-02-051-1/+1
| * Update stable/10 to BETA1 in preparation for 10.3-BETA1 builds.marius2016-02-051-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-031-1/+1
|\ \ | |/
| * MFC 278320,278336,278830,285621:jhb2016-02-011-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-271-1/+12
|\ \ | |/
| * MFH (r293033): ignore unload unless loaded + add a reload targetdes2016-01-261-1/+12
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-251-0/+1
|\ \ | |/
| * MFC r293901,r294371arybchik2016-01-201-0/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-152-2/+3
|\ \ | |/
| * Update stable/10 from 10.2-STABLE to 10.3-PRERELEASE,marius2016-01-151-2/+2
| * MFC r293734arybchik2016-01-141-0/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-135-6/+49
|\ \ | |/
| * MFC r266474:jimharris2016-01-112-0/+3
| * MFC r283569 (by nyan):dchagin2016-01-091-2/+14
| * MFC r283506 (by rodrigc):dchagin2016-01-092-2/+2
| * MFC r283474:dchagin2016-01-092-0/+2
| * MFC r283441:dchagin2016-01-093-0/+3
| * MFC r283421:dchagin2016-01-091-0/+1
OpenPOWER on IntegriCloud