Merge of /home/davem/src/GIT/tg3-2.6/