summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-parport.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
commit04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch)
treed2f803b4eef6108648f1beee6bf97a342cd9bc73 /drivers/i2c/busses/i2c-parport.h
parentInput: imx_keypad - Propagate the real error code on platform_get_irq() failure (diff)
parentLinux 3.14-rc4 (diff)
downloadlinux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.xz
linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'drivers/i2c/busses/i2c-parport.h')
-rw-r--r--drivers/i2c/busses/i2c-parport.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-parport.h b/drivers/i2c/busses/i2c-parport.h
index 3fe652302ea7..e572f3aac0f7 100644
--- a/drivers/i2c/busses/i2c-parport.h
+++ b/drivers/i2c/busses/i2c-parport.h
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------ *
* i2c-parport.h I2C bus over parallel port *
* ------------------------------------------------------------------------ *
- Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org>
+ Copyright (C) 2003-2010 Jean Delvare <jdelvare@suse.de>
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