Merge v2.6.37.6 from git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.37.y