From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Feb 2013 19:04:46 +0000 (-0800)
Subject: Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: MMI-PSA29.97-13-9~15021
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b3cdda2b4f541439ca4205793040aa2e1c852e3b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree changes from Grant Likely:
 "All around device tree changes destined for v3.8.  Aside from the
  documentation updates the highlights in this branch include:

   - Kbuild changes for using CPP with .dts files
   - locking fix from preempt_rt patchset
   - include DT alias names in device uevent
   - Selftest bugfixes and improvements
   - New function for counting phandles stanzas in a property
   - constify argument to of_node_full_name()
   - Various bug fixes

  This tree did also contain a commit to use platform_device_add instead
  of open-coding the device add code, but it caused problems with amba
  devices and needed to be reverted."

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
  Revert "of: use platform_device_add"
  kbuild: limit dtc+cpp include path
  gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
  of: Create function for counting number of phandles in a property
  of/base: Clean up exit paths for of_parse_phandle_with_args()
  of/selftest: Use selftest() macro throughout
  of/selftest: Fix GPIOs selftest to cover the 7th case
  of: fix recursive locking in of_get_next_available_child()
  documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
  OF: convert devtree lock from rw_lock to raw spinlock
  of/exynos_g2d: Add Bindings for exynos G2D driver
  kbuild: create a rule to run the pre-processor on *.dts files
  input: Extend matrix-keypad device tree binding
  devicetree: Move NS2 LEDs binding into LEDs directory
  of: use platform_device_add
  powerpc/5200: Fix size to request_mem_region() call
  documentation/devicetree: Fix typos
  of: add 'const' to of_node_full_name parameter
  of: Output devicetree alias names in uevent
  DT: add vendor prefixes for Renesas and Toshiba
  ...
---

b3cdda2b4f541439ca4205793040aa2e1c852e3b
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 15321373ec8d,4519dff3f506..19e1ef73ab0d
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -50,9 -52,9 +52,10 @@@ simte
  sirf	SiRF Technology, Inc.
  snps 	Synopsys, Inc.
  st	STMicroelectronics
 +ste	ST-Ericsson
  stericsson	ST-Ericsson
  ti	Texas Instruments
+ toshiba	Toshiba Corporation
  via	VIA Technologies, Inc.
  wlf	Wolfson Microelectronics
  wm	Wondermedia Technologies, Inc.