diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 04:27:58 +0100 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 04:27:58 +0100 |
commit | d05f06e60df4f56a70fb8a3e46335b40687169e9 (patch) | |
tree | c1eec6749fed86a21b08606e1e4acefe4b033253 /arch/hexagon/include/asm/irq.h | |
parent | Merge branch 'arch-s390' into no-rebases (diff) | |
parent | frv: fix the broken preempt (diff) | |
download | linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.xz linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.zip |
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/hexagon/include/asm/irq.h')
-rw-r--r-- | arch/hexagon/include/asm/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/irq.h b/arch/hexagon/include/asm/irq.h index ded8c15cf3e5..51661db389d6 100644 --- a/arch/hexagon/include/asm/irq.h +++ b/arch/hexagon/include/asm/irq.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. + * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and |