diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:41:51 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:41:51 +0100 |
| commit | 3c3dd225819112e56554162c6b37e61a31924e0c (patch) | |
| tree | 5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /arch/hexagon/include/asm/timer-regs.h | |
| parent | Revert "OMAPDSS: HDMI: Create platform device for audio support" (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | linux-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz linux-3c3dd225819112e56554162c6b37e61a31924e0c.zip | |
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
Diffstat (limited to 'arch/hexagon/include/asm/timer-regs.h')
| -rw-r--r-- | arch/hexagon/include/asm/timer-regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/timer-regs.h b/arch/hexagon/include/asm/timer-regs.h index d80db239a7b6..79912b8c1e5b 100644 --- a/arch/hexagon/include/asm/timer-regs.h +++ b/arch/hexagon/include/asm/timer-regs.h @@ -1,7 +1,7 @@ /* * Timer support for Hexagon * - * 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 |