diff options
| author | Greg Kroah-Hartman | 2014-11-10 04:24:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-11-10 04:24:26 +0100 |
| commit | cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6 (patch) | |
| tree | fc9726003631b9ed9da7fc73db53ed47317198cf /drivers/i2c/busses/i2c-designware-core.h | |
| parent | staging: rtl8188eu: unneeded NULL check (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.tar.gz kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.tar.xz kernel-qcow2-linux-cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6.zip | |
Merge 3.18-rc4 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index d66b6cbc9edc..5a410ef17abd 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -18,10 +18,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. * ---------------------------------------------------------------------------- * */ |