reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-c/de-NetAachen b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-c/de-NetAachen
new file mode 100755
index 0000000..58ee594
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-scan-table/dvb-c/de-NetAachen
@@ -0,0 +1,292 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20120605 1 0 CABLE DE </w_scan>
+# Manually adjusted by reducing whitespace between fec and mod
+#------------------------------------------------------------------------------
+# location and provider: Germany, Aachen, NetAachen, http://www.netaachen.de/
+# date (yyyy-mm-dd) : 2013-04-11
+# provided by (opt) : Till Maas <opensource@till.name>
+#
+# C[2] [plp_id] [data_slice_id] [system_id] <freq> <sr> <fec> <mod> [# comment]
+#------------------------------------------------------------------------------
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 113000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 642000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 618000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 634000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 626000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 562000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 402000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 121000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 570000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 394000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 586000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 650000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 658000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 666000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 674000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 682000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 690000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 714000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 602000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 410000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 418000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 530000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 538000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 346000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 338000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[NetCologne]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 129000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 354000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 362000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 370000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 386000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[BetaDigital]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 378000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/64
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 610000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 578000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 698000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBC/ANNEX_A
+ FREQUENCY = 706000000
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ MODULATION = QAM/256
+ INVERSION = AUTO
+