Changes in LICENCE

b097d552bc9ee0351bb0c3d1219856e845df59f9 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Tue, 19 Jan 2010 00:12:48 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/fs/jffs2/LICENCE

a7709d926dbc7cb1541034fcf2b21ce3e838cb12 - Merge branch 't-ml-master' into t-master

Mon, 18 Jan 2010 14:08:32 +0000

Merge branch 't-ml-master' into t-master List of files: /rk3399_rockchip-uboot/fs/jffs2/LICENCE

f098337152ca48e135448f5e7836cce938e12bc0 - JFFS2: drop support for LZARI compression mode

Fri, 15 Jan 2010 10:10:33 +0000

JFFS2: drop support for LZARI compression modeSupport for LZARI compression mode was added based on a MTD CVSsnapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c containscontradictory licensing terms: the original copyright clause says "Allrights reserved. Permission granted for non-commercial use.", butlater reference to the file 'LICENCE' in the jffs2 directory was addedwhich says GPL v2 or later.As no boards ever used LZARI compression, and this file is also notpresent in recent MTD code, we resolve this conflict by removing theconflicting file and references to it.Also copy the referenced but missing file 'LICENCE' from the currentMTD source tree.Signed-off-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/fs/jffs2/LICENCE