commit 8871e73fdbde07d0a41393f7ee30787b65387b36
author Linus Torvalds <torvalds@g5.osdl.org> Mon Jun 26 10:08:32 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Jun 26 10:08:32 2006 -0700
tree c54027e3ceb18f00db886871494d5e7b56e74b45
parent 61a46dc9d1c10d07a2ed6b7d346b868803b52506
parent 749805dc10e955b0170573061f9522a6a21cbae0

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Add iomap interfaces.
  [OPENPROM]: Rewrite driver to use in-kernel device tree.
  [OPENPROMFS]: Rewrite using in-kernel device tree and seq_file.
  [SPARC]: Add unique device_node IDs and a ".node" property.
  [SPARC]: Add of_set_property() interface.
  [SPARC64]: Export auxio_register to modules.
  [SPARC64]: Add missing interfaces to dma-mapping.h
  [SPARC64]: Export _PAGE_IE to modules.
  [SPARC64]: Allow floppy driver to build modular.
  [SPARC]: Export x_bus_type to modules.
  [RIOWATCHDOG]: Fix the build.
  [CPWATCHDOG]: Fix the build.
  [PARPORT] sunbpp: Fix typo.
  [MTD] sun_uflash: Port to new EBUS device layer.