diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-08 09:32:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-08 09:32:29 -0800 |
| commit | fe606dffea01481af4bb440ac2717da901383369 (patch) | |
| tree | 98142826ee8d309d0e537b4ce870e277feae2ac0 /drivers/i2c/busses/i2c-parport.h | |
| parent | a50d7156f171c9ee1f1b58d354114fbdcf4faf1e (diff) | |
| parent | e4df3a0b62285130ac0a35cf07678c154ffb649d (diff) | |
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
Diffstat (limited to 'drivers/i2c/busses/i2c-parport.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-parport.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-parport.h b/drivers/i2c/busses/i2c-parport.h index e572f3aac0f7..4e1294536805 100644 --- a/drivers/i2c/busses/i2c-parport.h +++ b/drivers/i2c/busses/i2c-parport.h @@ -12,10 +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., 675 Mass Ave, Cambridge, MA 02139, USA. * ------------------------------------------------------------------------ */ #define PORT_DATA 0 |