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

Commit fe606dff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c bugfixes from Wolfram Sang:
 "One bigger cleanup (FSF address removal) and two bugfixes for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: Dispose OF IRQ mapping at client removal time
  i2c: at91: don't account as iowait
  i2c: remove FSF address
parents a50d7156 e4df3a0b

drivers/i2c/algos/i2c-algo-bit.c

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ 
    but WITHOUT ANY WARRANTY; without even the implied warranty of

    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., 51 Franklin Street, Fifth Floor, Boston,

    MA 02110-1301 USA.

 * ------------------------------------------------------------------------- */



/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki

drivers/i2c/algos/i2c-algo-pca.c

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ 
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  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., 51 Franklin Street, Fifth Floor, Boston,

 *  MA 02110-1301 USA.

 */



#include <linux/kernel.h>

drivers/i2c/algos/i2c-algo-pcf.c

+0 −5
Original line number Diff line number Diff line
@@ -14,11 +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., 51 Franklin Street, Fifth Floor, Boston,

 *  MA 02110-1301 USA.

 *

 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and

 * Frodo Looijaard <frodol@dds.nl>, and also from Martin Bailey

 * <mbailey@littlefeet-inc.com>

drivers/i2c/algos/i2c-algo-pcf.h

+1 −6
Original line number Diff line number Diff line
@@ -12,12 +12,7 @@ 
    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    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., 51 Franklin Street, Fifth Floor, Boston,

    MA 02110-1301 USA.							*/

    GNU General Public License for more details.			*/

/* --------------------------------------------------------------------	*/



/* With some changes from Frodo Looijaard <frodol@dds.nl> */

drivers/i2c/busses/i2c-ali1535.c

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  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.

*/



/*