diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
| commit | 5118afa75776a41209a94f4a4ddf7c3164fac0df (patch) | |
| tree | a899f605d0f0d9be1fb44d7a8d643a1233065dda /sys/conf | |
| parent | 58b7eab7d39d983cc70f6f1d611f00470a76fca1 (diff) | |
| parent | ce58d6dbf38815b68dedcf0559779e5ceb149a0d (diff) | |
| download | FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.zip FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index cfc7884..268892b 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -346,6 +346,7 @@ dev/sfxge/common/hunt_rx.c optional sfxge pci dev/sfxge/common/hunt_sram.c optional sfxge pci dev/sfxge/common/hunt_tx.c optional sfxge pci dev/sfxge/common/hunt_vpd.c optional sfxge pci +dev/sfxge/common/medford_nic.c optional sfxge pci dev/sfxge/common/siena_mac.c optional sfxge pci dev/sfxge/common/siena_mcdi.c optional sfxge pci dev/sfxge/common/siena_nic.c optional sfxge pci diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 97bec5c..70babeca 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -31,8 +31,8 @@ # $FreeBSD$ TYPE="FreeBSD" -REVISION="10.2" -BRANCH="STABLE" +REVISION="10.3" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
