diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 00:18:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 00:18:27 +0300 |
| commit | 5142ef1cbda9a48ff87e9b944096767252204c6e (patch) | |
| tree | f3227002f3cc0169566f5c34291b86f876bb676c /arch/m68k/lib/divsi3.S | |
| parent | 6a16dda86ebbcfe690c753c3fb469b4f9ad5a5ef (diff) | |
| parent | b24f670b7f5b2058b95370caa9f104b3cefb9f1d (diff) | |
| download | linux-5142ef1cbda9a48ff87e9b944096767252204c6e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization
m68k/pci: Remove a superflous KERN_ERR
m68k/defconfig: Update defconfigs for v4.0-rc1
m68k/q40: Make NE2000 builtin instead of modular
m68k: Remove FSF address
Diffstat (limited to 'arch/m68k/lib/divsi3.S')
| -rw-r--r-- | arch/m68k/lib/divsi3.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/lib/divsi3.S b/arch/m68k/lib/divsi3.S index ec307b61991e..2c0ec85ac661 100644 --- a/arch/m68k/lib/divsi3.S +++ b/arch/m68k/lib/divsi3.S @@ -19,12 +19,7 @@ distribution when not linked into another program.) This file is distributed in the hope that it will be useful, 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; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +General Public License for more details. */ /* As a special exception, if you link this library with files compiled with GCC to produce an executable, this does not cause |