From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 14:37:38 +0000 (-0700)
Subject: Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: upstream/snapshot3+hdmi~14515
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62a11ae3405b6da2535d28e5facc2de5af4a7e62;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of: change of_match_device to work with struct device
  of: Remove duplicate fields from of_platform_driver
  drivercore: Add of_match_table to the common device drivers
  arch/microblaze: Move dma_mask from of_device into pdev_archdata
  arch/powerpc: Move dma_mask from of_device into pdev_archdata
  of: eliminate of_device->node and dev_archdata->{of,prom}_node
  of: Always use 'struct device.of_node' to get device node pointer.
  i2c/of: Allow device node to be passed via i2c_board_info
  driver-core: Add device node pointer to struct device
  of: protect contents of of_platform.h and of_device.h
  of/flattree: Make unflatten_device_tree() safe to call from any arch
  of/flattree: make of_fdt.h safe to unconditionally include.
---

62a11ae3405b6da2535d28e5facc2de5af4a7e62