Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)
commit17be03f0a1f42ccfccb38f7d0a94c0f0169634a6
tree8fe4fc7a987547c546e7b493eecb3607a9583795
parentcce0cac125623f9b68f25dd1350f6d616220a8dd
parent85d1494e5ff8e20a52ce514584ffda4f0265025e
Merge master.kernel.org:/home/rmk/linux-2.6-serial
arch/mips/cobalt/setup.c