generic-2.6: sync patches to 2.6.33.1