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