#
1.13 |
|
01-Sep-2023 |
christos |
merge conflicts between 20230628 and 20221020
|
Revision tags: netbsd-10-base bouyer-sunxi-drm-base
|
#
1.12 |
|
27-Aug-2022 |
christos |
merge conflicts between acpica-20211217 and acpica-20220331
|
Revision tags: thorpej-i2c-spi-conf2-base thorpej-futex2-base thorpej-cfargs2-base cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base thorpej-i2c-spi-conf-base thorpej-cfargs-base thorpej-futex-base
|
#
1.11 |
|
03-Apr-2021 |
christos |
Merge local changes with acpica-20210331
|
Revision tags: bouyer-xenpvh-base2 phil-wifi-20200421 bouyer-xenpvh-base1 phil-wifi-20200411 bouyer-xenpvh-base phil-wifi-20200406
|
#
1.10 |
|
28-Mar-2020 |
christos |
branches: 1.10.4; 1.10.6; merge conflicts
|
Revision tags: netbsd-9-3-RELEASE netbsd-9-2-RELEASE netbsd-9-1-RELEASE is-mlppp-base ad-namecache-base3 netbsd-9-0-RELEASE netbsd-9-0-RC2 ad-namecache-base2 ad-namecache-base1 ad-namecache-base netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
|
#
1.9 |
|
29-Apr-2019 |
christos |
merge conflicts
|
Revision tags: isaki-audio2-base pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521
|
#
1.8 |
|
05-May-2018 |
christos |
branches: 1.8.2; merge acpica 20180427
|
Revision tags: pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415
|
#
1.7 |
|
07-Apr-2018 |
christos |
Merge conflicts; STA methods and fields are not present anymore.
|
Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base tls-maxphys-base-20171202 matt-nb8-mediatek-base nick-nhusb-base-20170825 perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 jdolecek-ncq-base pgoyette-localcount-20170320 nick-nhusb-base-20170204
|
#
1.6 |
|
25-Jan-2017 |
christos |
branches: 1.6.12; 1.6.14; merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
branches: 1.5.2; 1.5.4; merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
#
1.12 |
|
27-Aug-2022 |
christos |
merge conflicts between acpica-20211217 and acpica-20220331
|
Revision tags: thorpej-i2c-spi-conf2-base thorpej-futex2-base thorpej-cfargs2-base cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base thorpej-i2c-spi-conf-base thorpej-cfargs-base thorpej-futex-base
|
#
1.11 |
|
03-Apr-2021 |
christos |
Merge local changes with acpica-20210331
|
Revision tags: bouyer-xenpvh-base2 phil-wifi-20200421 bouyer-xenpvh-base1 phil-wifi-20200411 bouyer-xenpvh-base phil-wifi-20200406
|
#
1.10 |
|
28-Mar-2020 |
christos |
branches: 1.10.4; 1.10.6; merge conflicts
|
Revision tags: netbsd-9-3-RELEASE netbsd-9-2-RELEASE netbsd-9-1-RELEASE is-mlppp-base ad-namecache-base3 netbsd-9-0-RELEASE netbsd-9-0-RC2 ad-namecache-base2 ad-namecache-base1 ad-namecache-base netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
|
#
1.9 |
|
29-Apr-2019 |
christos |
merge conflicts
|
Revision tags: isaki-audio2-base pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521
|
#
1.8 |
|
05-May-2018 |
christos |
branches: 1.8.2; merge acpica 20180427
|
Revision tags: pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415
|
#
1.7 |
|
07-Apr-2018 |
christos |
Merge conflicts; STA methods and fields are not present anymore.
|
Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base tls-maxphys-base-20171202 matt-nb8-mediatek-base nick-nhusb-base-20170825 perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 jdolecek-ncq-base pgoyette-localcount-20170320 nick-nhusb-base-20170204
|
#
1.6 |
|
25-Jan-2017 |
christos |
branches: 1.6.12; 1.6.14; merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
branches: 1.5.2; 1.5.4; merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
Revision tags: thorpej-cfargs-base thorpej-futex-base
|
#
1.11 |
|
03-Apr-2021 |
christos |
Merge local changes with acpica-20210331
|
Revision tags: bouyer-xenpvh-base2 phil-wifi-20200421 bouyer-xenpvh-base1 phil-wifi-20200411 bouyer-xenpvh-base phil-wifi-20200406
|
#
1.10 |
|
28-Mar-2020 |
christos |
branches: 1.10.4; 1.10.6; merge conflicts
|
Revision tags: netbsd-9-1-RELEASE is-mlppp-base ad-namecache-base3 netbsd-9-0-RELEASE netbsd-9-0-RC2 ad-namecache-base2 ad-namecache-base1 ad-namecache-base netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
|
#
1.9 |
|
29-Apr-2019 |
christos |
merge conflicts
|
Revision tags: isaki-audio2-base pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521
|
#
1.8 |
|
05-May-2018 |
christos |
branches: 1.8.2; merge acpica 20180427
|
Revision tags: pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415
|
#
1.7 |
|
07-Apr-2018 |
christos |
Merge conflicts; STA methods and fields are not present anymore.
|
Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base tls-maxphys-base-20171202 matt-nb8-mediatek-base nick-nhusb-base-20170825 perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 jdolecek-ncq-base pgoyette-localcount-20170320 nick-nhusb-base-20170204
|
#
1.6 |
|
25-Jan-2017 |
christos |
branches: 1.6.12; 1.6.14; merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
branches: 1.5.2; 1.5.4; merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
#
1.10 |
|
28-Mar-2020 |
christos |
merge conflicts
|
Revision tags: ad-namecache-base3 netbsd-9-0-RELEASE netbsd-9-0-RC2 ad-namecache-base2 ad-namecache-base1 ad-namecache-base netbsd-9-0-RC1 phil-wifi-20191119 netbsd-9-base phil-wifi-20190609
|
#
1.9 |
|
29-Apr-2019 |
christos |
merge conflicts
|
Revision tags: isaki-audio2-base pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521
|
#
1.8 |
|
05-May-2018 |
christos |
branches: 1.8.2; merge acpica 20180427
|
Revision tags: pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415
|
#
1.7 |
|
07-Apr-2018 |
christos |
Merge conflicts; STA methods and fields are not present anymore.
|
Revision tags: netbsd-8-1-RELEASE netbsd-8-1-RC1 netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base tls-maxphys-base-20171202 matt-nb8-mediatek-base nick-nhusb-base-20170825 perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 jdolecek-ncq-base pgoyette-localcount-20170320 nick-nhusb-base-20170204
|
#
1.6 |
|
25-Jan-2017 |
christos |
branches: 1.6.12; 1.6.14; merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
branches: 1.5.2; 1.5.4; merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
#
1.9 |
|
29-Apr-2019 |
christos |
merge conflicts
|
Revision tags: isaki-audio2-base pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521
|
#
1.8 |
|
05-May-2018 |
christos |
merge acpica 20180427
|
Revision tags: pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415
|
#
1.7 |
|
07-Apr-2018 |
christos |
Merge conflicts; STA methods and fields are not present anymore.
|
Revision tags: netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base tls-maxphys-base-20171202 matt-nb8-mediatek-base nick-nhusb-base-20170825 perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 jdolecek-ncq-base pgoyette-localcount-20170320 nick-nhusb-base-20170204
|
#
1.6 |
|
25-Jan-2017 |
christos |
branches: 1.6.12; 1.6.14; merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
branches: 1.5.2; 1.5.4; merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
#
1.6 |
|
25-Jan-2017 |
christos |
merge conflicts
|
Revision tags: bouyer-socketcan-base pgoyette-localcount-20170107 nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|
Revision tags: nick-nhusb-base-20161204 pgoyette-localcount-20161104 nick-nhusb-base-20161004 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base nick-nhusb-base-20160907 nick-nhusb-base-20160529 nick-nhusb-base-20160422 nick-nhusb-base-20160319
|
#
1.5 |
|
09-Jan-2016 |
christos |
merge new acpica
|
Revision tags: nick-nhusb-base-20151226 nick-nhusb-base-20150921
|
#
1.4 |
|
18-Aug-2015 |
christos |
merge conflicts
|
Revision tags: nick-nhusb-base-20150606
|
#
1.3 |
|
13-Apr-2015 |
christos |
resolve conflicts.
|
Revision tags: nick-nhusb-base-20150406 nick-nhusb-base
|
#
1.2 |
|
25-Oct-2014 |
christos |
branches: 1.2.2; merge conflicts
|
#
1.1 |
|
25-Oct-2014 |
christos |
branches: 1.1.1; Initial revision
|