diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-02-16 15:47:26 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-02-16 15:47:26 +0100 |
commit | 6d1e6cb7aa95b8dd3651a5cd0253d8c04fec13be (patch) | |
tree | 4663dafbd101f1bcc576b388b887c4095e3faad2 /crypto/camellia_generic.c | |
parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
parent | bd9b55f04cf31a9addf1a26af8aed79cbebfd09d (diff) | |
download | linux-crypto-6d1e6cb7aa95b8dd3651a5cd0253d8c04fec13be.tar.gz linux-crypto-6d1e6cb7aa95b8dd3651a5cd0253d8c04fec13be.zip |
Merge tag 'irqchip-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 4.16-rc2 from Marc Zyngier
- A MIPS GIC fix for spurious, masked interrupts
- A fix for a subtle IPI bug in GICv3
- Do not probe GICv3 ITSs that are marked as disabled
- Multi-MSI support for GICv2m
- Various cleanups
Diffstat (limited to 'crypto/camellia_generic.c')
-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/>. */ /* |