git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 18 Aug 2010 16:26:17 +0000 (09:26 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 18 Aug 2010 16:26:17 +0000 (09:26 -0700)

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  spi.h: missing kernel-doc notation, please fix
  of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
  of: Fix missing includes
  ata: update for of_device to platform_device replacement
  microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
  microblaze: Fix of/address: Merge all of the bus translation code
  booting-without-of: Remove nonexistent chapters from TOC, fix numbering

Trivial merge