diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:10:24 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:10:24 -0500 |
| commit | 69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 (patch) | |
| tree | f4ad376b3aaf2b68e9066df3885ee8dd297251cb /drivers/i2c/busses/i2c-designware-pcidrv.c | |
| parent | 35a27eab6f94e15fa30f7662af00fbec50526f4a (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-pcidrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-pcidrv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index d31d313ab4f7..acb40f95db78 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c | |||
| @@ -19,10 +19,6 @@ | |||
| 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 21 | * GNU General Public License for more details. | 21 | * GNU General Public License for more details. |
| 22 | * | ||
| 23 | * You should have received a copy of the GNU General Public License | ||
| 24 | * along with this program; if not, write to the Free Software | ||
| 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 26 | * ---------------------------------------------------------------------------- | 22 | * ---------------------------------------------------------------------------- |
| 27 | * | 23 | * |
| 28 | */ | 24 | */ |