Merge master.kernel.org:/home/rmk/linux-2.6-arm
[deliverable/linux.git] / kernel /
2005-06-04  Linus TorvaldsAutomatic merge of 'misc-fixes' branch from