summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-03-02396-1141/+2335
|\
| * Merge OpenSSL 1.0.1s. This is a security update.delphij2016-03-02389-1121/+2322
| * MFC r295969:ae2016-03-022-2/+2
| * MFC r295995:bdrewery2016-03-021-11/+1
| * MFC [Hyper-V]: r296028sephe2016-03-013-6/+9
| * MFC r295944:jimharris2016-02-291-1/+1
* | Enable syscons, used by installer. It should fix #4387Renato Botelho2016-03-021-1/+0
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-02-2852-149501/+149720
|\ \ | |/
| * Update stable/10 to BETA3 in preparation for 10.3-BETA3 builds.marius2016-02-261-1/+1
| * MFC: r295906marius2016-02-265-6/+12
| * MFC r295830davidcs2016-02-254-1064/+110
| * MFC r295823davidcs2016-02-252-42/+56
| * MFC r294854davidcs2016-02-252-147795/+147789
| * MFC r295273:tuexen2016-02-251-7/+11
| * MFC r295323:erj2016-02-2524-333/+1457
| * MFC r295549:tuexen2016-02-2511-106/+161
| * MFH 295796 (based on)araujo2016-02-251-2/+3
| * MFC r294933,r294949,r294952,r294953,r294957,r294965,r294967,r294968,r295017,bdrewery2016-02-244-144/+106
| * MFC 295636,295637:jhb2016-02-242-1/+3
| * MFC r295717:kib2016-02-241-0/+9
* | Remove ixgbe from wrap kernelsRenato Botelho2016-02-262-2/+0
* | The ixgbe is now built as an amd64 module. Remove the driver from kernel.Luiz Otavio O Souza2016-02-261-1/+0
* | apply r295094 after latest import:Luiz Otavio O Souza2016-02-251-1/+4
* | Fix the build... again...Luiz Otavio O Souza2016-02-251-0/+3
* | Fix the build, there is no RSS support in stable/10.Luiz Otavio O Souza2016-02-252-0/+4
* | Import of Intel ix-3.1.14 driver.Luiz Otavio O Souza2016-02-2510-470/+307
* | Restore missing pieces lost during net80211 revertRenato Botelho2016-02-242-1/+2
* | 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
OpenPOWER on IntegriCloud