diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 07:51:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 07:51:06 -0800 |
| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /arch/hexagon/kernel/traps.c | |
| parent | 6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d (diff) | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) | |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
Diffstat (limited to 'arch/hexagon/kernel/traps.c')
| -rw-r--r-- | arch/hexagon/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c index f08857d0715b..a41eeb8eeaa1 100644 --- a/arch/hexagon/kernel/traps.c +++ b/arch/hexagon/kernel/traps.c @@ -1,7 +1,7 @@ /* * Kernel traps/events for Hexagon processor * - * 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 |