tree dadb5d86c9f05bdbfe3180c3b307630c08f721b3
parent 3b89f56783a4ef796190ef1192c25e72e0b986b6
parent 5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc
author Linus Torvalds <torvalds@linux-foundation.org> 1282148777 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282148777 -0700

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

* '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