Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 27 Oct 2006 22:36:21 +0000 (15:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 27 Oct 2006 22:36:21 +0000 (15:36 -0700)
commit858cbcdd4f7a235f609249b9ca681b7ec5d786a3
treeae91051bfcd25d4d1aa8c720d11305115c205114
parentfe31eb679752369240fc8880858a5ed974554eb2
parentf5ef9d11fd255b30b455d18f8d721bc44cd1296b
Merge /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.