From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 1 Feb 2018 17:40:07 +0000 (-0600)
Subject: Merge branch 'pci/spdx' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ab8c609356fbe8dbcd44df11e884ce8cddf3739e;p=linux.git

Merge branch 'pci/spdx' into next

* pci/spdx:
  PCI: Add SPDX GPL-2.0+ to replace implicit GPL v2 or later statement
  PCI: Add SPDX GPL-2.0+ to replace GPL v2 or later boilerplate
  PCI: Add SPDX GPL-2.0 to replace COPYING boilerplate
  PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
  PCI: Add SPDX GPL-2.0 when no license was specified
---

ab8c609356fbe8dbcd44df11e884ce8cddf3739e
diff --cc drivers/pci/of.c
index c7136e2596986,fd721b8140e7e..a28355c273ae8
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@@ -2,13 -3,7 +3,8 @@@
   * PCI <-> OF mapping helpers
   *
   * Copyright 2011 IBM Corp.
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
   */
 +#define pr_fmt(fmt)	"PCI: OF: " fmt
  
  #include <linux/irqdomain.h>
  #include <linux/kernel.h>