git » linux-kernel » commit 62a11ae

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

author Linus Torvalds
2010-05-24 14:37:38 UTC
committer Linus Torvalds
2010-05-24 14:37:38 UTC
parent cedfb2db7b2d6b2c780999536aa1e2650fadee36
parent cf9b59e9d3e008591d1f54830f570982bb307a0d

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.