Merge master.kernel.org:/home/davem/BK/davem-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux