diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 17:51:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 17:51:34 -0700 |
commit | 3573d3869de475cca9f2d4998fc3c2871a4cc2db (patch) | |
tree | 5b556cd8abcef8014f5ea4b9e95835ba4badc40a /arch/arc/boot/dts/skeleton.dts | |
parent | c8d9762affa0a97e299be2cabfec861515ef1580 (diff) | |
parent | 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb (diff) |
Merge tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta:
- Support for external initrd from Noam
- Fix broken serial console in nsimosci Virtual Platform
- Reuse of ENTRY/END assembler macros across hand asm code
- Other minor fixes here and there
* tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [nsimosci] Unbork console
ARC: [nsimosci] Change .dts to use generic 8250 UART
ARC: [SMP] General Fixes
ARC: Remove unused DT template file
ARC: [clockevent] simplify timer ISR
ARC: [clockevent] can't be SoC specific
ARC: Remove ARC_HAS_COH_RTSC
ARC: switch to generic ENTRY/END assembler annotations
ARC: support external initrd
ARC: add uImage to .gitignore
ARC: [arcfpga] Fix __initconst data const-correctness
Diffstat (limited to 'arch/arc/boot/dts/skeleton.dts')
-rw-r--r-- | arch/arc/boot/dts/skeleton.dts | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arc/boot/dts/skeleton.dts b/arch/arc/boot/dts/skeleton.dts deleted file mode 100644 index 25a84fb5b3dc..000000000000 --- a/arch/arc/boot/dts/skeleton.dts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -/dts-v1/; - -/include/ "skeleton.dtsi" |