Drop one bug fix that was included. Refresh various other patches with more or less serious conflicts. svn path=/dists/sid/linux/; revision=19304
Backported by Jonathan Nieder. svn path=/dists/sid/linux-2.6/; revision=19018