From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jul 2013 19:39:39 +0000 (-0700)
Subject: Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... 
X-Git-Tag: v3.11-rc1~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7644a448ccf200d95ad4426e84a486dec5cc1703;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'metag-for-v3.11' of git://git./linux/kernel/git/jhogan/metag

Pull Metag architecture changes from James Hogan:
 - Infrastructure and DT files for TZ1090 SoC (pin control drivers
   already merged via pinctrl tree).
 - Panic on boot instead of just warning if cache aliasing possible.
 - Various SMP/hotplug fixes.
 - Various other randconfig/sparse fixes.

* tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (24 commits)
  metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c
  metag: cpu hotplug: route_irq: preserve irq mask
  metag: kick: add missing irq_enter/exit to kick_handler()
  metag: smp: don't spin waiting for CPU to start
  metag: smp: enable irqs after set_cpu_online
  metag: use clear_tasks_mm_cpumask()
  metag: tz1090: select and instantiate pinctrl-tz1090-pdc
  metag: tz1090: select and instantiate pinctrl-tz1090
  metag: don't check for cache aliasing on smp cpu boot
  metag: panic if cache aliasing possible
  metag: *.dts: include using preprocessor
  metag: add <dt-bindings/> symlink
  metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files
  metag/traps: include setup.h for the per_cpu_trap_init declaration
  metag/traps: Mark die() as __noreturn to match the declaration.
  metag/processor.h: Add missing cpuinfo_op declaration.
  metag/setup: Restrict scope for the capabilities variable
  metag/mm/cache: Restrict scope for metag_lnkget_probe
  metag/asm/irq.h: Declare init_IRQ
  metag/kernel/irq.c: Declare root_domain as static
  ...
---

7644a448ccf200d95ad4426e84a486dec5cc1703
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index db0457d,be80992..948f615
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -58,9 -57,9 +58,10 @@@ snps 	Synopsys, Inc
  st	STMicroelectronics
  ste	ST-Ericsson
  stericsson	ST-Ericsson
+ toumaz	Toumaz
  ti	Texas Instruments
  toshiba	Toshiba Corporation
 +v3	V3 Semiconductor
  via	VIA Technologies, Inc.
  wlf	Wolfson Microelectronics
  wm	Wondermedia Technologies, Inc.