Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Wed, 8 Feb 2006 23:21:22 +0000 (15:21 -0800)]
1  2 
arch/mips/cobalt/setup.c

Simple merge