7ca0026495dbb644b4e32ede76be44072cb2bc7a
parent 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5
author David Woodhouse <dwmw2@shinybook.infradead.org> 1116500040 +0100
committer David Woodhouse <dwmw2@shinybook.infradead.org> 1116500040 +0100

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