Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c5bb31 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 55d1cad2 14648d65

drivers/net/wireless/iwlwifi/dvm/agn.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/dvm/calib.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/dvm/calib.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/dvm/commands.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,7 +30,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as