Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git