tree 96f56121c3afed843fb705cbc75aa85cf9038fd0
parent b07019f29328ebb1b48d3faf952b84f07ec9b973
parent 9f29333dae3488542b1344871e8ecb84084ad80e
author David Woodhouse <dwmw2@infradead.org> 1146497077 +0100
committer David Woodhouse <dwmw2@infradead.org> 1146497077 +0100

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

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

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