Merge bk://kernel.bkbits.net/gregkh/linux/merge-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux