Merge branch 'bl-cpuinfo' of git://linux-arm.org/linux-2.6-lp into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Nov 2012 20:19:38 +0000 (20:19 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Nov 2012 20:19:38 +0000 (20:19 +0000)
1  2 
arch/arm/kernel/setup.c

Simple merge