Merge branch 'bl-cpuinfo' of git://linux-arm.org/linux-2.6-lp into devel-stable