Merge http://linux.bkbits.net/linux-2.5

into are.twiddle.net:/home/rth/BK/linux-alpha-2.5

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/media/video/bttv-driver.c
Simple merge

diff --cc drivers/media/video/meye.c
Simple merge

diff --cc drivers/net/via-rhine.c
Simple merge