Merge tag 'v2.6.39.4' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.39.y into HEAD