Regularize my copyright notice

o Remove All Rights Reserved from my notices
o imp@FreeBSD.org everywhere
o regularize punctiation, eliminate date ranges
o Make sure that it's clear that I don't claim All Rights reserved by listing
  All Rights Reserved on same line as other copyright holders (but not
  me). Other such holders are also listed last where it's clear.

6 files changed, 9 insertions, 11 deletions

diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
index 7e149e2dd9ee..73e722ea1694 100644
--- a/sys/arm/allwinner/a10_ahci.c
+++ b/sys/arm/allwinner/a10_ahci.c
@@ -1,7 +1,6 @@
 /*-
- * Copyright (c) 2014-2015 M. Warner Losh <imp@freebsd.org>
- * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org> All rights reserved.
+ * Copyright (c) 2014-2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/conf/genboardid.awk b/sys/arm/conf/genboardid.awk
index 03338ad9e697..f07993b1ef8e 100644
--- a/sys/arm/conf/genboardid.awk
+++ b/sys/arm/conf/genboardid.awk
@@ -4,7 +4,7 @@
 #-
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
-# Copyright (c) 2012 M. Warner Losh.
+# Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index 9bb51e989fff..803dda2e2763 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/atags.h b/sys/arm/include/atags.h
index 91d52ed28a5b..baf39b5c0c69 100644
--- a/sys/arm/include/atags.h
+++ b/sys/arm/include/atags.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2012 M. Warner Losh.
+ * Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/board.h b/sys/arm/include/board.h
index 82a06b3795c5..62554a5d68ee 100644
--- a/sys/arm/include/board.h
+++ b/sys/arm/include/board.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2012 M. Warner Losh.
+ * Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index 05fde412f7c9..1dc2b584e97f 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -1,10 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh
- * Copyright (c) 2005 Olivier Houchard
- * Copyright (c) 2012 Thomas Skibo
- * All rights reserved.
+ * Copyright (c) 2005 Olivier Houchard All rights reserved.
+ * Copyright (c) 2012 Thomas Skibo All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions