Merge branch 'linux-loongson-2.6.36' into linux-2.6.36-stable