Merge branch 'for-2.6.24' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...