]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Sun, 31 Dec 2006 22:24:58 +0000 (14:24 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sun, 31 Dec 2006 22:24:58 +0000 (14:24 -0800)
* 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.


Trivial merge