summaryrefslogtreecommitdiff
path: root/drivers/i2c/busses/i2c-powermac.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-10 06:10:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-10 06:10:24 +0300
commit69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 (patch)
treef4ad376b3aaf2b68e9066df3885ee8dd297251cb /drivers/i2c/busses/i2c-powermac.c
parent35a27eab6f94e15fa30f7662af00fbec50526f4a (diff)
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff)
downloadlinux-69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03.tar.xz
Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-powermac.c')
-rw-r--r--drivers/i2c/busses/i2c-powermac.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 01e967763c2a..60a53c169ed2 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -14,10 +14,6 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
*/
#include <linux/module.h>