]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 27 Nov 2008 12:42:48 +0000 (12:42 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 27 Nov 2008 12:42:48 +0000 (12:42 +0000)
1  2 
arch/arm/mm/proc-v7.S

Simple merge