tter Linus Torvalds <torvalds@g5.osdl.org> 1133219008 -0800

Merge master.kernel.org:/home/rmk/linux-2.6-serial
§6b