Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

Do arch/ia64/defconfig by hand.