Most of these patches came from Gentoo's 2.5.1-r3 patchset
