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

This commit is contained in:
Linus Torvalds 2005-11-21 19:00:43 -08:00
commit 5ea8051a23