From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 27 Oct 2006 22:36:21 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.19-rc4~70
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=858cbcdd4f7a235f609249b9ca681b7ec5d786a3;p=linux-2.6-omap-h63xx.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:
  [SPARC]: Fix bus_id[] string overflow.
---

858cbcdd4f7a235f609249b9ca681b7ec5d786a3