7dcfac50ff9b63
author David Woodhouse <dwmw2@shinybook.infradead.org> 1120307949 +0100
committer David Woodhouse <dwmw2@shinybook.infradead.org> 1120307949 +0100

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

B�uא