diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 12:42:04 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-10 12:42:04 +0900 |
| commit | 394e849b83463869e2267ea7acea002366e6fefc (patch) | |
| tree | 917ec5c564964d781ffbda2917efdf7cde252c72 /drivers/i2c/i2c-smbus.c | |
| parent | 98267d33e2da8cd386212856a22f4a64b32834ab (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge 3.18-rc4 into tty-next.
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/i2c-smbus.c')
| -rw-r--r-- | drivers/i2c/i2c-smbus.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index fc99f0d6b4a5..9ebf9cb4ad7a 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -13,11 +13,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> |