Merge branch 'viro'

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc drivers/net/hp100.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/tulip/xircom_cb.c
Simple merge