Merge master.kernel.org:/pub/scm/linux/kernel/git/agk/linux-2.6-dm