diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:37:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:37:38 -0700 |
| commit | 62a11ae3405b6da2535d28e5facc2de5af4a7e62 (patch) | |
| tree | 6b68f0e74fe08c0e87488ec0653d59c653e46745 | |
| parent | cedfb2db7b2d6b2c780999536aa1e2650fadee36 (diff) | |
| parent | cf9b59e9d3e008591d1f54830f570982bb307a0d (diff) | |
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.