tree b59b6610928accc3289f7d142319bb19342eee98
parent b836267aa79c1c5e23e00d9cec047b6870ae0db1
parent f4060c0dbbe9ad7b8c0aeefa142398c8d3468bac
author Linus Torvalds <torvalds@woody.osdl.org> 1167603898 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1167603898 -0800

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:
  [SPARC64]: Handle ISA devices with no 'regs' property.
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix of_iounmap() region release.
  [SPARC64]: Fix "mem=xxx" handling.