diff options
author | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
---|---|---|
committer | John Johansen <john.johansen@canonical.com> | 2018-05-02 00:38:52 -0700 |
commit | db5c6566ee03e097b4b7f7e207189c0906e9d1aa (patch) | |
tree | fb78e31032dcca2fcb0e9123cf11be12728f99c5 /crypto/camellia_generic.c | |
parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
parent | ef734472771a62ae9f901367a40a89382a991917 (diff) | |
download | linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.tar.gz linux-crypto-db5c6566ee03e097b4b7f7e207189c0906e9d1aa.zip |
Merge tag 'v4.17-rc3' into apparmor-next
Linux v4.17-rc3
Merge in v4.17 for LSM updates
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to '')
-rw-r--r-- | crypto/camellia_generic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c index a02286bf..32ddd483 100644 --- a/crypto/camellia_generic.c +++ b/crypto/camellia_generic.c @@ -13,8 +13,7 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* |