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

This commit is contained in:
Linus Torvalds 2005-10-06 15:00:53 -07:00
commit 5cd9a60cc6