Merge bk://are.twiddle.net/axp-2.5
into home.osdl.org:/home/torvalds/v2.5/linux