Merge bk://bk.arm.linux.org.uk

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc drivers/serial/sunsab.c
Simple merge

diff --cc drivers/serial/sunzilog.c
Simple merge