summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-2419-447/+725
|\
| * MFC r295914: MFV r295913:delphij2016-02-241-2/+5
| * MFH: 285685araujo2016-02-245-4/+40
| * MFC [Hyper-V]: r294553, r294700sephe2016-02-249-188/+593
| * In preparation for 10.3-RELEASE, temporarily revert the MFC of r291244marius2016-02-231-242/+80
| * MFC r295665:bdrewery2016-02-231-8/+0
| * MFC r295737:markj2016-02-221-2/+3
| * MFC r295574:markj2016-02-221-1/+4
* | Revert "Revert 295285 which was an MFC of the tryforward work (r290383,295282...Renato Botelho2016-02-2210-151/+20
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-2210-20/+151
|\ \ | |/
| * Revert 295285 which was an MFC of the tryforward work (r290383,295282,295283)gnn2016-02-2210-20/+151
* | Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"Renato Botelho2016-02-22168-44317/+4879
* | Revert "Fix the build after net80211HEAD.tgz."Renato Botelho2016-02-222-2/+1
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-221-2/+2
|\ \ | |/
| * MFC r286641 (from oshogbo):garga2016-02-221-2/+2
* | Revert "MFC of r286641:"Luiz Otavio O Souza2016-02-221-2/+2
* | Correct a mis-merge when imported VLAN PCP code:Renato Botelho2016-02-221-9/+9
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-227-31/+1319
|\ \ | |/
| * MFC: r287299 [1]marius2016-02-223-23/+1227
| * MFC: r264565marius2016-02-211-1/+76
| * MFH (r294326): fall back to standard / configured CA storedes2016-02-201-3/+10
| * MFC r272785:smh2016-02-201-3/+5
| * MFC, r295417:ken2016-02-191-1/+1
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-1920-205/+649
|\ \ | |/
| * MFC [Hyper-V]: r293719-r293722, r293869-r293871, r293873-r293875, r293877sephe2016-02-1916-189/+603
| * MFC r295616:pfg2016-02-171-5/+8
| * MFC r295022:jimharris2016-02-172-3/+28
| * MFC r295532:jimharris2016-02-171-8/+10
* | MFC of r286641:Luiz Otavio O Souza2016-02-181-2/+2
* | Importing pfSense patch pfaltq_interface_bw.diffLuiz Otavio O Souza2016-02-171-8/+5
* | Revert "Importing pfSense patch pfaltq_interface_bw.diff"Luiz Otavio O Souza2016-02-171-5/+8
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-1723-165/+287
|\ \ | |/
| * MFH (r295536): fix double-free error when SSL connection failsdes2016-02-171-1/+0
| * MFH (r295535): use insecure-lan-zones option instead of hardcoded listdes2016-02-1715-139/+269
| * MFH (r295533): remove broken unbound-control-setup scriptdes2016-02-173-2/+2
| * MFC r295455bapt2016-02-161-1/+2
| * MFC 295418,295419:jhb2016-02-162-2/+2
| * MFC r295497: Update uefi.8 for ZFS and multi device boot supportemaste2016-02-161-20/+12
* | Import patch from https://reviews.freebsd.org/D5186Renato Botelho2016-02-154-7/+11
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-1510-25/+43
|\ \ | |/
| * drm/i915: Restore pci_enable_busmaster() call in the init pathdumbbell2016-02-155-13/+7
| * MFC r295495 - Update leapsecond file in non-chroot environments.cy2016-02-141-4/+4
| * MFC r295496: Document boot1.efi's handling of /boot.configemaste2016-02-141-1/+12
| * MFC r294598:kib2016-02-141-5/+10
| * MFC r294596:kib2016-02-141-2/+3
| * MFC r294595:kib2016-02-141-0/+7
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-02-1384-1260/+2931
|\ \ | |/
| * Update stable/10 to BETA2 in preparation for 10.3-BETA2 builds.marius2016-02-121-1/+1
| * Merge from current r294767,294769,295408imp2016-02-112-15/+186
| * MFC r295320, r295356 (Partial)smh2016-02-115-181/+517
OpenPOWER on IntegriCloud