]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Fix bus_id[] string overflow.


Trivial merge