Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Reverting c7afb48e since a better (but
more intrusive) fix is now merged upstream.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>