From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sun, 31 Dec 2006 22:24:58 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~31683
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a;p=firefly-linux-kernel-4.4.55.git

Merge /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.
---

9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a