Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git