Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git