[SerialICE] Patch set updated for serialice: Remove address from copyright notice

HAOUAS Elyes (ehaouas@noos.fr) gerrit at coreboot.org
Sun Jun 12 16:35:26 CEST 2016


HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15159

-gerrit

commit aab22f747073002d2173d1e63f255bb322ab3834
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Sun Jun 12 16:28:53 2016 +0200

    Remove address from copyright notice
    
    Remove the address from the copyright notices.
    
    Change-Id: I43e0721c268410a5dd5a7d2318d410b881cbfce6
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 Makefile                                                            | 2 +-
 SerialICE/Kconfig                                                   | 2 +-
 SerialICE/Makefile                                                  | 2 +-
 SerialICE/chipset.c                                                 | 2 +-
 SerialICE/io.h                                                      | 2 +-
 SerialICE/mainboard/amd_serengeti-cheetah.c                         | 2 +-
 SerialICE/mainboard/aopen_dxpl-plus.c                               | 2 +-
 SerialICE/mainboard/asrock_775i65g.c                                | 2 +-
 SerialICE/mainboard/asrock_939a785gmh.c                             | 2 +-
 SerialICE/mainboard/asrock_p4i65gv.c                                | 2 +-
 SerialICE/mainboard/asus_f2a85-m.c                                  | 2 +-
 SerialICE/mainboard/asus_k8v-x.c                                    | 2 +-
 SerialICE/mainboard/asus_m2v-mx_se.c                                | 2 +-
 SerialICE/mainboard/asus_m4a77td-pro.c                              | 2 +-
 SerialICE/mainboard/asus_p2-m3a3200.c                               | 2 +-
 SerialICE/mainboard/asus_p2b.c                                      | 2 +-
 SerialICE/mainboard/asus_p4p800-vm.c                                | 2 +-
 SerialICE/mainboard/commell_lv_672.c                                | 2 +-
 SerialICE/mainboard/dell_s1850.c                                    | 2 +-
 SerialICE/mainboard/hp_dl165_g6.c                                   | 2 +-
 SerialICE/mainboard/intel_d845gbv2.c                                | 2 +-
 SerialICE/mainboard/intel_d94x.c                                    | 2 +-
 SerialICE/mainboard/jetway_nf81_t56n_lf.c                           | 2 +-
 SerialICE/mainboard/kontron_986lcd-m.c                              | 2 +-
 SerialICE/mainboard/lenovo_x60.c                                    | 2 +-
 SerialICE/mainboard/msi_ms6178.c                                    | 2 +-
 SerialICE/mainboard/msi_ms7133.c                                    | 2 +-
 SerialICE/mainboard/qemu-x86.c                                      | 2 +-
 SerialICE/mainboard/rca_rm4100.c                                    | 2 +-
 SerialICE/mainboard/roda_rk886ex.c                                  | 2 +-
 SerialICE/mainboard/televideo_tc7010.c                              | 2 +-
 SerialICE/mainboard/thomson_ip1000.c                                | 2 +-
 SerialICE/mainboard/tyan_s2892.c                                    | 2 +-
 SerialICE/mainboard/tyan_s2895.c                                    | 2 +-
 SerialICE/mainboard/tyan_s2912.c                                    | 2 +-
 SerialICE/mainboard/wyse_s50.c                                      | 2 +-
 SerialICE/serial.c                                                  | 2 +-
 SerialICE/serialice.c                                               | 2 +-
 SerialICE/serialice.h                                               | 2 +-
 SerialICE/serialice.ld                                              | 2 +-
 SerialICE/southbridge/amd-sbxxx.c                                   | 2 +-
 SerialICE/southbridge/intel-ich7.c                                  | 2 +-
 SerialICE/start.S                                                   | 2 +-
 SerialICE/superio/fintek-f71869ad.c                                 | 2 +-
 SerialICE/superio/ite-it8718f.c                                     | 2 +-
 SerialICE/superio/winbond-w83627thg.c                               | 2 +-
 SerialICE/types.h                                                   | 2 +-
 SerialICE/util/kconfig/zconf.tab.c_shipped                          | 2 +-
 qemu-0.15.x/COPYING                                                 | 2 --
 qemu-0.15.x/COPYING.LIB                                             | 2 +-
 qemu-0.15.x/hw/omap_spi.c                                           | 1 -
 qemu-0.15.x/hw/pci_bridge.h                                         | 2 +-
 qemu-0.15.x/linux-headers/COPYING                                   | 2 +-
 qemu-0.15.x/linux-headers/asm-powerpc/kvm.h                         | 2 +-
 qemu-0.15.x/linux-headers/asm-powerpc/kvm_para.h                    | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/i386/core/patch_cf.S                 | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/i386/include/efi/ipxe/dhcp_arch.h    | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/i386/include/pcbios/ipxe/dhcp_arch.h | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_api.c           | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_strerror.c      | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/x86/include/linux/ipxe/dhcp_arch.h   | 2 +-
 qemu-0.15.x/roms/ipxe/src/arch/x86_64/include/efi/ipxe/dhcp_arch.h  | 2 +-
 qemu-0.15.x/roms/ipxe/src/core/strtoull.c                           | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/linux/linux.c                     | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/linux/tap.c                       | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.c                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82540.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82542.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.c             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_defines.h         | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_hw.h              | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.c             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_main.c            | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.c          | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.h          | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.c             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_osdep.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.c             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_regs.h            | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.c               | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.h               | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.c   | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.h   | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.c         | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.h         | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_defines.h       | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_hw.h            | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.c       | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.h       | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_main.c          | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.c        | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.h        | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.c           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_regs.h          | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snp.h                     | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.c                  | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.h                  | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snponly.c                 | 2 +-
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.c                     | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.h                     | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.c               | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.h               | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.c                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_defines.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_hw.h                  | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.c                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_main.c                | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.c              | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.h              | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.c                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_osdep.h               | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.c                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_regs.h                | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf.h                 | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_defines.h         | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_main.c            | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.c             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.h             | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_osdep.h           | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_regs.h            | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.c              | 1 -
 qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.h              | 1 -
 qemu-0.15.x/roms/ipxe/src/hci/linux_args.c                          | 2 +-
 qemu-0.15.x/roms/ipxe/src/include/hci/linux_args.h                  | 2 +-
 qemu-0.15.x/roms/ipxe/src/include/ipxe/linux.h                      | 2 +-
 qemu-0.15.x/roms/ipxe/src/include/ipxe/linux/linux_uaccess.h        | 2 +-
 qemu-0.15.x/roms/ipxe/src/include/linux_api.h                       | 2 +-
 qemu-0.15.x/roms/ipxe/src/interface/linux/linux_console.c           | 2 +-
 qemu-0.15.x/roms/ipxe/src/interface/linux/linux_smbios.c            | 2 +-
 qemu-0.15.x/roms/ipxe/src/interface/linux/linux_timer.c             | 2 +-
 qemu-0.15.x/roms/ipxe/src/interface/linux/linux_umalloc.c           | 2 +-
 qemu-0.15.x/roms/vgabios/biossums.c                                 | 2 +-
 qemu-0.15.x/s390-dis.c                                              | 6 +++---
 util/lint/lint-000-license-headers                                  | 2 +-
 util/lint/lint-stable-003-whitespace                                | 2 +-
 153 files changed, 82 insertions(+), 156 deletions(-)

diff --git a/Makefile b/Makefile
index 95d2bb1..0abef06 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## Foundation, Inc.
 ##
 
 # Qemu version
diff --git a/SerialICE/Kconfig b/SerialICE/Kconfig
index 6f8df67..4a60e5c 100644
--- a/SerialICE/Kconfig
+++ b/SerialICE/Kconfig
@@ -14,7 +14,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## Foundation, Inc.
 ##
 
 #
diff --git a/SerialICE/Makefile b/SerialICE/Makefile
index e764992..94a9016 100644
--- a/SerialICE/Makefile
+++ b/SerialICE/Makefile
@@ -14,7 +14,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## Foundation, Inc.
 ##
 
 VERSION="1.5"
diff --git a/SerialICE/chipset.c b/SerialICE/chipset.c
index c9f75ab..52e08e8 100644
--- a/SerialICE/chipset.c
+++ b/SerialICE/chipset.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* PCI access functions */
diff --git a/SerialICE/io.h b/SerialICE/io.h
index 30accc2..5a4dbb1 100644
--- a/SerialICE/io.h
+++ b/SerialICE/io.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef IO_H
diff --git a/SerialICE/mainboard/amd_serengeti-cheetah.c b/SerialICE/mainboard/amd_serengeti-cheetah.c
index 3179b62..62a918b 100644
--- a/SerialICE/mainboard/amd_serengeti-cheetah.c
+++ b/SerialICE/mainboard/amd_serengeti-cheetah.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="AMD SERENGETI CHEETAH           ";
diff --git a/SerialICE/mainboard/aopen_dxpl-plus.c b/SerialICE/mainboard/aopen_dxpl-plus.c
index d8c6bea..9af89ab 100644
--- a/SerialICE/mainboard/aopen_dxpl-plus.c
+++ b/SerialICE/mainboard/aopen_dxpl-plus.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="AOpen DXPL Plus                 ";
diff --git a/SerialICE/mainboard/asrock_775i65g.c b/SerialICE/mainboard/asrock_775i65g.c
index 4d1512f..ef369cb 100644
--- a/SerialICE/mainboard/asrock_775i65g.c
+++ b/SerialICE/mainboard/asrock_775i65g.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASRock 775i65G                  ";
diff --git a/SerialICE/mainboard/asrock_939a785gmh.c b/SerialICE/mainboard/asrock_939a785gmh.c
index 5c5b588..17a0414 100644
--- a/SerialICE/mainboard/asrock_939a785gmh.c
+++ b/SerialICE/mainboard/asrock_939a785gmh.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Asrock 939a785gmh               ";
diff --git a/SerialICE/mainboard/asrock_p4i65gv.c b/SerialICE/mainboard/asrock_p4i65gv.c
index d0f46f4..22855ac 100644
--- a/SerialICE/mainboard/asrock_p4i65gv.c
+++ b/SerialICE/mainboard/asrock_p4i65gv.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASRock P4i65GV                  ";
diff --git a/SerialICE/mainboard/asus_f2a85-m.c b/SerialICE/mainboard/asus_f2a85-m.c
index 8eebde3..0fc4f43 100644
--- a/SerialICE/mainboard/asus_f2a85-m.c
+++ b/SerialICE/mainboard/asus_f2a85-m.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Asus F2A85-M                    ";
diff --git a/SerialICE/mainboard/asus_k8v-x.c b/SerialICE/mainboard/asus_k8v-x.c
index 68ad177..c0a690b 100644
--- a/SerialICE/mainboard/asus_k8v-x.c
+++ b/SerialICE/mainboard/asus_k8v-x.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASUS K8V-X                      ";
diff --git a/SerialICE/mainboard/asus_m2v-mx_se.c b/SerialICE/mainboard/asus_m2v-mx_se.c
index 06a8ec9..40ef4c4 100644
--- a/SerialICE/mainboard/asus_m2v-mx_se.c
+++ b/SerialICE/mainboard/asus_m2v-mx_se.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASUS M2V-MX SE                  ";
diff --git a/SerialICE/mainboard/asus_m4a77td-pro.c b/SerialICE/mainboard/asus_m4a77td-pro.c
index 3bc15a5..36e0639 100644
--- a/SerialICE/mainboard/asus_m4a77td-pro.c
+++ b/SerialICE/mainboard/asus_m4a77td-pro.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASUS M4A77TD-PRO                ";
diff --git a/SerialICE/mainboard/asus_p2-m3a3200.c b/SerialICE/mainboard/asus_p2-m3a3200.c
index fa233a6..e5aa4cf 100644
--- a/SerialICE/mainboard/asus_p2-m3a3200.c
+++ b/SerialICE/mainboard/asus_p2-m3a3200.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASUS Pundit P2-M3A3200          ";
diff --git a/SerialICE/mainboard/asus_p2b.c b/SerialICE/mainboard/asus_p2b.c
index 068229a..4cd053d 100644
--- a/SerialICE/mainboard/asus_p2b.c
+++ b/SerialICE/mainboard/asus_p2b.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the ASUS P2B mainboard.  */
diff --git a/SerialICE/mainboard/asus_p4p800-vm.c b/SerialICE/mainboard/asus_p4p800-vm.c
index 4109bc0..b469f5b 100644
--- a/SerialICE/mainboard/asus_p4p800-vm.c
+++ b/SerialICE/mainboard/asus_p4p800-vm.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="ASUS P4P800-VM                  ";
diff --git a/SerialICE/mainboard/commell_lv_672.c b/SerialICE/mainboard/commell_lv_672.c
index 8f81e8e..fb8d5e5 100644
--- a/SerialICE/mainboard/commell_lv_672.c
+++ b/SerialICE/mainboard/commell_lv_672.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Commell LV-672                  ";
diff --git a/SerialICE/mainboard/dell_s1850.c b/SerialICE/mainboard/dell_s1850.c
index 861479f..69333e1 100644
--- a/SerialICE/mainboard/dell_s1850.c
+++ b/SerialICE/mainboard/dell_s1850.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the Dell S1850 */
diff --git a/SerialICE/mainboard/hp_dl165_g6.c b/SerialICE/mainboard/hp_dl165_g6.c
index 6aff1e9..223f34f 100644
--- a/SerialICE/mainboard/hp_dl165_g6.c
+++ b/SerialICE/mainboard/hp_dl165_g6.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="HP DL165 G6                     ";
diff --git a/SerialICE/mainboard/intel_d845gbv2.c b/SerialICE/mainboard/intel_d845gbv2.c
index 3588c33..8589f89 100644
--- a/SerialICE/mainboard/intel_d845gbv2.c
+++ b/SerialICE/mainboard/intel_d845gbv2.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Intel D845GBV2                  ";
diff --git a/SerialICE/mainboard/intel_d94x.c b/SerialICE/mainboard/intel_d94x.c
index 50bbe87..e6dc052 100644
--- a/SerialICE/mainboard/intel_d94x.c
+++ b/SerialICE/mainboard/intel_d94x.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the Intel D945GCLF/D945GNT mainboards */
diff --git a/SerialICE/mainboard/jetway_nf81_t56n_lf.c b/SerialICE/mainboard/jetway_nf81_t56n_lf.c
index 7b704a0..4425788 100644
--- a/SerialICE/mainboard/jetway_nf81_t56n_lf.c
+++ b/SerialICE/mainboard/jetway_nf81_t56n_lf.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Jetway NF81-T56N-LF             ";
diff --git a/SerialICE/mainboard/kontron_986lcd-m.c b/SerialICE/mainboard/kontron_986lcd-m.c
index abde14f..d3d5557 100644
--- a/SerialICE/mainboard/kontron_986lcd-m.c
+++ b/SerialICE/mainboard/kontron_986lcd-m.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the Kontron 986LCD-M mainboard */
diff --git a/SerialICE/mainboard/lenovo_x60.c b/SerialICE/mainboard/lenovo_x60.c
index 68a9d5a..ffe75db 100644
--- a/SerialICE/mainboard/lenovo_x60.c
+++ b/SerialICE/mainboard/lenovo_x60.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #define PC87392_GPIO_PIN_DEBOUNCE       0x40
diff --git a/SerialICE/mainboard/msi_ms6178.c b/SerialICE/mainboard/msi_ms6178.c
index a4edb5a..be50148 100644
--- a/SerialICE/mainboard/msi_ms6178.c
+++ b/SerialICE/mainboard/msi_ms6178.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="MSI MS6178                      ";
diff --git a/SerialICE/mainboard/msi_ms7133.c b/SerialICE/mainboard/msi_ms7133.c
index fc7e753..6c38c05 100644
--- a/SerialICE/mainboard/msi_ms7133.c
+++ b/SerialICE/mainboard/msi_ms7133.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="MSI MS7133                      ";
diff --git a/SerialICE/mainboard/qemu-x86.c b/SerialICE/mainboard/qemu-x86.c
index 0177fad..3335cf6 100644
--- a/SerialICE/mainboard/qemu-x86.c
+++ b/SerialICE/mainboard/qemu-x86.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="QEMU X86                        ";
diff --git a/SerialICE/mainboard/rca_rm4100.c b/SerialICE/mainboard/rca_rm4100.c
index bd4aa02..6aa91ac 100644
--- a/SerialICE/mainboard/rca_rm4100.c
+++ b/SerialICE/mainboard/rca_rm4100.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the RCA RM4100 mainboard */
diff --git a/SerialICE/mainboard/roda_rk886ex.c b/SerialICE/mainboard/roda_rk886ex.c
index b93b5c0..58bd08e 100644
--- a/SerialICE/mainboard/roda_rk886ex.c
+++ b/SerialICE/mainboard/roda_rk886ex.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /*
diff --git a/SerialICE/mainboard/televideo_tc7010.c b/SerialICE/mainboard/televideo_tc7010.c
index b22df9a..741e840 100644
--- a/SerialICE/mainboard/televideo_tc7010.c
+++ b/SerialICE/mainboard/televideo_tc7010.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33] = "Televideo TC7010                ";
diff --git a/SerialICE/mainboard/thomson_ip1000.c b/SerialICE/mainboard/thomson_ip1000.c
index ff20930..f3f2c88 100644
--- a/SerialICE/mainboard/thomson_ip1000.c
+++ b/SerialICE/mainboard/thomson_ip1000.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the THOMSON IP1000 mainboard */
diff --git a/SerialICE/mainboard/tyan_s2892.c b/SerialICE/mainboard/tyan_s2892.c
index d009165..fb4013d 100644
--- a/SerialICE/mainboard/tyan_s2892.c
+++ b/SerialICE/mainboard/tyan_s2892.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Tyan S2892                      ";
diff --git a/SerialICE/mainboard/tyan_s2895.c b/SerialICE/mainboard/tyan_s2895.c
index 3f06ba6..ad3cfc7 100644
--- a/SerialICE/mainboard/tyan_s2895.c
+++ b/SerialICE/mainboard/tyan_s2895.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Tyan S2895                      ";
diff --git a/SerialICE/mainboard/tyan_s2912.c b/SerialICE/mainboard/tyan_s2912.c
index 5afbc62..942f957 100644
--- a/SerialICE/mainboard/tyan_s2912.c
+++ b/SerialICE/mainboard/tyan_s2912.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 const char boardname[33]="Tyan S2912                      ";
diff --git a/SerialICE/mainboard/wyse_s50.c b/SerialICE/mainboard/wyse_s50.c
index 57a54c5..c92a824 100644
--- a/SerialICE/mainboard/wyse_s50.c
+++ b/SerialICE/mainboard/wyse_s50.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This is a chipset init file for the WYSE S50 thin client.  */
diff --git a/SerialICE/serial.c b/SerialICE/serial.c
index 9188deb..118b270 100644
--- a/SerialICE/serial.c
+++ b/SerialICE/serial.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* Data */
diff --git a/SerialICE/serialice.c b/SerialICE/serialice.c
index 56f6dac..8135a2b 100644
--- a/SerialICE/serialice.c
+++ b/SerialICE/serialice.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <types.h>
diff --git a/SerialICE/serialice.h b/SerialICE/serialice.h
index ab8a26a..f21f460 100644
--- a/SerialICE/serialice.h
+++ b/SerialICE/serialice.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef SERIALICE_H
diff --git a/SerialICE/serialice.ld b/SerialICE/serialice.ld
index f43d9f2..baf2ef0 100644
--- a/SerialICE/serialice.ld
+++ b/SerialICE/serialice.ld
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
diff --git a/SerialICE/southbridge/amd-sbxxx.c b/SerialICE/southbridge/amd-sbxxx.c
index 27b6b3b..9751b46 100644
--- a/SerialICE/southbridge/amd-sbxxx.c
+++ b/SerialICE/southbridge/amd-sbxxx.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This initializes AMD SBxx that
diff --git a/SerialICE/southbridge/intel-ich7.c b/SerialICE/southbridge/intel-ich7.c
index c58aca1..e6f0ef5 100644
--- a/SerialICE/southbridge/intel-ich7.c
+++ b/SerialICE/southbridge/intel-ich7.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This initializes Intel's ICH7 that
diff --git a/SerialICE/start.S b/SerialICE/start.S
index 2ec0bb3..cafa8de 100644
--- a/SerialICE/start.S
+++ b/SerialICE/start.S
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "serialice.h"
diff --git a/SerialICE/superio/fintek-f71869ad.c b/SerialICE/superio/fintek-f71869ad.c
index c04389b..f42102d 100644
--- a/SerialICE/superio/fintek-f71869ad.c
+++ b/SerialICE/superio/fintek-f71869ad.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #define SUPERIO_CONFIG_PORT 0x2e
diff --git a/SerialICE/superio/ite-it8718f.c b/SerialICE/superio/ite-it8718f.c
index 2659532..6dde2ac 100644
--- a/SerialICE/superio/ite-it8718f.c
+++ b/SerialICE/superio/ite-it8718f.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #define IT8718F_SP1  0x01 /* Com1 */
diff --git a/SerialICE/superio/winbond-w83627thg.c b/SerialICE/superio/winbond-w83627thg.c
index 5213921..a1b870e 100644
--- a/SerialICE/superio/winbond-w83627thg.c
+++ b/SerialICE/superio/winbond-w83627thg.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This sets up the Super IO so up to 4 COM ports are usable */
diff --git a/SerialICE/types.h b/SerialICE/types.h
index 7ddeafa..8f79aee 100644
--- a/SerialICE/types.h
+++ b/SerialICE/types.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef TYPES_H
diff --git a/SerialICE/util/kconfig/zconf.tab.c_shipped b/SerialICE/util/kconfig/zconf.tab.c_shipped
index 97b2772..7eb1c2e 100644
--- a/SerialICE/util/kconfig/zconf.tab.c_shipped
+++ b/SerialICE/util/kconfig/zconf.tab.c_shipped
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Foundation, Inc.
    Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
diff --git a/qemu-0.15.x/COPYING b/qemu-0.15.x/COPYING
index 00ccfbb..e892cf0 100644
--- a/qemu-0.15.x/COPYING
+++ b/qemu-0.15.x/COPYING
@@ -2,7 +2,6 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +304,6 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/qemu-0.15.x/COPYING.LIB b/qemu-0.15.x/COPYING.LIB
index 48afc2e..56aea25 100644
--- a/qemu-0.15.x/COPYING.LIB
+++ b/qemu-0.15.x/COPYING.LIB
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/qemu-0.15.x/hw/omap_spi.c b/qemu-0.15.x/hw/omap_spi.c
index a6b0349..87f7387 100644
--- a/qemu-0.15.x/hw/omap_spi.c
+++ b/qemu-0.15.x/hw/omap_spi.c
@@ -17,7 +17,6 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "hw.h"
 #include "omap.h"
diff --git a/qemu-0.15.x/hw/pci_bridge.h b/qemu-0.15.x/hw/pci_bridge.h
index 84411a6..ef36763 100644
--- a/qemu-0.15.x/hw/pci_bridge.h
+++ b/qemu-0.15.x/hw/pci_bridge.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Foundation, Inc.
  *
  * split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc]
  * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
diff --git a/qemu-0.15.x/linux-headers/COPYING b/qemu-0.15.x/linux-headers/COPYING
index ca442d3..9726cac 100644
--- a/qemu-0.15.x/linux-headers/COPYING
+++ b/qemu-0.15.x/linux-headers/COPYING
@@ -321,7 +321,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc.
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/qemu-0.15.x/linux-headers/asm-powerpc/kvm.h b/qemu-0.15.x/linux-headers/asm-powerpc/kvm.h
index 777d307..d63894e 100644
--- a/qemu-0.15.x/linux-headers/asm-powerpc/kvm.h
+++ b/qemu-0.15.x/linux-headers/asm-powerpc/kvm.h
@@ -10,7 +10,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Foundation, Inc.
  *
  * Copyright IBM Corp. 2007
  *
diff --git a/qemu-0.15.x/linux-headers/asm-powerpc/kvm_para.h b/qemu-0.15.x/linux-headers/asm-powerpc/kvm_para.h
index ad58c90..89f73db 100644
--- a/qemu-0.15.x/linux-headers/asm-powerpc/kvm_para.h
+++ b/qemu-0.15.x/linux-headers/asm-powerpc/kvm_para.h
@@ -10,7 +10,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Foundation, Inc.
  *
  * Copyright IBM Corp. 2008
  *
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/i386/core/patch_cf.S b/qemu-0.15.x/roms/ipxe/src/arch/i386/core/patch_cf.S
index 97a62f4..046da60 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/i386/core/patch_cf.S
+++ b/qemu-0.15.x/roms/ipxe/src/arch/i386/core/patch_cf.S
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER )
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/i386/include/efi/ipxe/dhcp_arch.h b/qemu-0.15.x/roms/ipxe/src/arch/i386/include/efi/ipxe/dhcp_arch.h
index 902caff..3b786de 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/i386/include/efi/ipxe/dhcp_arch.h
+++ b/qemu-0.15.x/roms/ipxe/src/arch/i386/include/efi/ipxe/dhcp_arch.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _DHCP_ARCH_H
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/i386/include/pcbios/ipxe/dhcp_arch.h b/qemu-0.15.x/roms/ipxe/src/arch/i386/include/pcbios/ipxe/dhcp_arch.h
index 822b3eb..5704f69 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/i386/include/pcbios/ipxe/dhcp_arch.h
+++ b/qemu-0.15.x/roms/ipxe/src/arch/i386/include/pcbios/ipxe/dhcp_arch.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _DHCP_ARCH_H
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_api.c b/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_api.c
index c8a09b7..e250c46 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_api.c
+++ b/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_api.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_strerror.c b/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_strerror.c
index 24c9b77..e4abf12 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_strerror.c
+++ b/qemu-0.15.x/roms/ipxe/src/arch/x86/core/linux/linux_strerror.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/x86/include/linux/ipxe/dhcp_arch.h b/qemu-0.15.x/roms/ipxe/src/arch/x86/include/linux/ipxe/dhcp_arch.h
index e83fd9d..30d2cfa 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/x86/include/linux/ipxe/dhcp_arch.h
+++ b/qemu-0.15.x/roms/ipxe/src/arch/x86/include/linux/ipxe/dhcp_arch.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _LINUX_DHCP_ARCH_H
diff --git a/qemu-0.15.x/roms/ipxe/src/arch/x86_64/include/efi/ipxe/dhcp_arch.h b/qemu-0.15.x/roms/ipxe/src/arch/x86_64/include/efi/ipxe/dhcp_arch.h
index af41b19..caeba86 100644
--- a/qemu-0.15.x/roms/ipxe/src/arch/x86_64/include/efi/ipxe/dhcp_arch.h
+++ b/qemu-0.15.x/roms/ipxe/src/arch/x86_64/include/efi/ipxe/dhcp_arch.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _DHCP_ARCH_H
diff --git a/qemu-0.15.x/roms/ipxe/src/core/strtoull.c b/qemu-0.15.x/roms/ipxe/src/core/strtoull.c
index b1ceeb4..66c5e86 100644
--- a/qemu-0.15.x/roms/ipxe/src/core/strtoull.c
+++ b/qemu-0.15.x/roms/ipxe/src/core/strtoull.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/linux/linux.c b/qemu-0.15.x/roms/ipxe/src/drivers/linux/linux.c
index 83546b2..df131b7 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/linux/linux.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/linux/linux.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/linux/tap.c b/qemu-0.15.x/roms/ipxe/src/drivers/linux/tap.c
index 53bb16a..0c9f93a 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/linux/tap.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/linux/tap.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #include <errno.h>
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.c
index a32a4d7..2bc62d1 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.h
index 31dbb85..491cfc5 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82540.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82540.c
index 41f3f97..9fe407f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82540.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82540.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.c
index 2d1aecc..35cb0fb 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.h
index f86a148..c832a8d 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82541.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82542.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82542.c
index b6d5202..f205f9a 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82542.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82542.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.c
index 848c99e..7b77799 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.h
index 30073e8..d050b4f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_82543.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.c
index 72aac4c..a43c4fa 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.h
index fc1e533..b74fe10 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_api.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_defines.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_defines.h
index c585f09..e9c2be7 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_defines.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_defines.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_hw.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_hw.h
index 753f75e..279604f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_hw.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_hw.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.c
index 2351387..d8970ce 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.h
index 51acae0..f0793fd 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_mac.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_main.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_main.c
index 653323b..d89d936 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_main.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_main.c
@@ -17,7 +17,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.c
index 3362942..a0d3da6 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.h
index 14467aa..c26ae4f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_manage.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.c
index 488252f..095d1e6 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.h
index 1585417..2864bc8 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_nvm.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_osdep.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_osdep.h
index 5cd8e39..a5f8cb0 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_osdep.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_osdep.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.c
index b3cad48..f5172a1 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.h
index 93bd7a1..d956aab 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_phy.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_regs.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_regs.h
index 579c070..806a9b0 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_regs.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000/e1000_regs.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.c
index b7318b7..0215fa2 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.h
index bc8e7b0..683f4ab 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.c
index a3eed9b..274a506 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.h
index 93430a1..4e10e1f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_80003es2lan.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.c
index a061d6d..02025a6 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.h
index c645e25..ab04efa 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_82571.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_defines.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_defines.h
index da135d9..04293a4 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_defines.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_defines.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_hw.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_hw.h
index 03ed35c..864f10c 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_hw.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_hw.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.c
index 7b9a49b..29b1b56 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.h
index af34478..6fdf0db 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_ich8lan.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.c
index d96b279..a380bf8 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.h
index 5b8a425..4222915 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_mac.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_main.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_main.c
index e5cb249..c02c0ba 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_main.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_main.c
@@ -18,7 +18,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.c
index e093536..c222927 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.h
index f136aee..6364ac0 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_manage.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.c
index f49d421..40b65d7 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.h
index 1a8e0f3..5d9e9be 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_nvm.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.c
index 337be73..5df3f60 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.h
index 9081050..cf378d5 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_phy.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_regs.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_regs.h
index 064d92c..c3080be 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_regs.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/e1000e/e1000e_regs.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snp.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snp.h
index 4d6b101..feed95e 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snp.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snp.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _SNP_H
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.c
index b725d40..c666978 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.h
index 72b4a7d..2daac51 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snpnet.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _SNPNET_H
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snponly.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snponly.c
index 6fcc54a..639255a 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snponly.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/efi/snponly.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.c
index cd5db1f..791e1f0 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.h
index c8e8205..27e2209 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.c
index b5b615a..b39fef4 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.h
index 12c9a24..1cfed7a 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_82575.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.c
index eda6bc0..f521792 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.h
index 2d97fec..c1b42c7 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_api.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_defines.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_defines.h
index 4f58ba8..ab7e7fc 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_defines.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_defines.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_hw.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_hw.h
index 65a04f2..7b73300 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_hw.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_hw.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.c
index 237c6c7..2b44fb2 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.h
index 7639e24..1278453 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_mac.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_main.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_main.c
index 9295c2c..d362b4a 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_main.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_main.c
@@ -17,7 +17,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.c
index b29d4c4..1c5ebf3 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.h
index ff70d8c..24bbe04 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_manage.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.c
index 1bad567..aaaec95 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.h
index 6b54d44..d050370 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_nvm.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_osdep.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_osdep.h
index 167b0f8..4fb14c5 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_osdep.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_osdep.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.c
index 16664fd..aa2aa39 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.h
index 8e6bc99..4b2ab53 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_phy.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_regs.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_regs.h
index e549675..4cf25d4 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_regs.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igb/igb_regs.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf.h
index 74f99c6..6128a15 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_defines.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_defines.h
index 7cf4ddb..2e5de6d 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_defines.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_defines.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_main.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_main.c
index 1f7e1df..3dabf0c 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_main.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_main.c
@@ -18,7 +18,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.c
index 6580938..359edb6 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.h
index c21af6c..b229e3f 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_mbx.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_osdep.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_osdep.h
index 259b9ec..63b4922 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_osdep.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_osdep.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_regs.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_regs.h
index 21603d3..8d67569 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_regs.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_regs.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.c b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.c
index f2dac8b..ed07ee7 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.c
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.c
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.h b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.h
index ce8ad79..5d11907 100644
--- a/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.h
+++ b/qemu-0.15.x/roms/ipxe/src/drivers/net/igbvf/igbvf_vf.h
@@ -14,7 +14,6 @@
 
   You should have received a copy of the GNU General Public License along with
   this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
   the file called "COPYING".
diff --git a/qemu-0.15.x/roms/ipxe/src/hci/linux_args.c b/qemu-0.15.x/roms/ipxe/src/hci/linux_args.c
index 0bce4af..a0e8560 100644
--- a/qemu-0.15.x/roms/ipxe/src/hci/linux_args.c
+++ b/qemu-0.15.x/roms/ipxe/src/hci/linux_args.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/include/hci/linux_args.h b/qemu-0.15.x/roms/ipxe/src/include/hci/linux_args.h
index ae1ed05..6e306f9 100644
--- a/qemu-0.15.x/roms/ipxe/src/include/hci/linux_args.h
+++ b/qemu-0.15.x/roms/ipxe/src/include/hci/linux_args.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _HCI_LINUX_ARGS_H
diff --git a/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux.h b/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux.h
index dac508e..5e9a4ae 100644
--- a/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux.h
+++ b/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _IPXE_LINUX_H
diff --git a/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux/linux_uaccess.h b/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux/linux_uaccess.h
index 1b49611..6008c53 100644
--- a/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux/linux_uaccess.h
+++ b/qemu-0.15.x/roms/ipxe/src/include/ipxe/linux/linux_uaccess.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _IPXE_LINUX_UACCESS_H
diff --git a/qemu-0.15.x/roms/ipxe/src/include/linux_api.h b/qemu-0.15.x/roms/ipxe/src/include/linux_api.h
index 066cdd3..f61cafb 100644
--- a/qemu-0.15.x/roms/ipxe/src/include/linux_api.h
+++ b/qemu-0.15.x/roms/ipxe/src/include/linux_api.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 #ifndef _LINUX_API_H
diff --git a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_console.c b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_console.c
index aeb7c66..45fda0a 100644
--- a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_console.c
+++ b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_console.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_smbios.c b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_smbios.c
index f99120b..486ec8c 100644
--- a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_smbios.c
+++ b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_smbios.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_timer.c b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_timer.c
index 6b4643a..46dc0d9 100644
--- a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_timer.c
+++ b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_timer.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_umalloc.c b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_umalloc.c
index aa0052c..4b8c044 100644
--- a/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_umalloc.c
+++ b/qemu-0.15.x/roms/ipxe/src/interface/linux/linux_umalloc.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
diff --git a/qemu-0.15.x/roms/vgabios/biossums.c b/qemu-0.15.x/roms/vgabios/biossums.c
index d5816f4..c3c9504 100644
--- a/qemu-0.15.x/roms/vgabios/biossums.c
+++ b/qemu-0.15.x/roms/vgabios/biossums.c
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ *  Foundation, Inc.
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/qemu-0.15.x/s390-dis.c b/qemu-0.15.x/s390-dis.c
index 8abcdf0..5791516 100644
--- a/qemu-0.15.x/s390-dis.c
+++ b/qemu-0.15.x/s390-dis.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   Foundation, Inc.
    02110-1301, USA.  */
 
 #include "qemu-common.h"
@@ -42,7 +42,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   Foundation, Inc.
    02110-1301, USA.  */
 
 #ifndef S390_H
@@ -465,7 +465,7 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   Foundation, Inc.
    02110-1301, USA.  */
 
 /* This file holds the S390 opcode table.  The opcode table
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index 9165aa6..3cbec01 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 #
 # DESCR: Check that all files in src/ and util/ have valid license headers
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index c2f5b3c..1b242f4 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 # DESCR: Check for superfluous whitespace in the tree
 



More information about the SerialICE mailing list