From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 10 Oct 2006 02:35:20 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1601ff0e29cfe112b06aa9bb2fb3519a1125baaa;p=linux-beck.git

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:
  [SPARC32]: Fix prom.c build warning
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix of_device bus_id settings.
  [SPARC64]: Update MAINTAINERS entry.
---

1601ff0e29cfe112b06aa9bb2fb3519a1125baaa