]> err.no Git - linux-2.6/commitdiff
Merge Linus' tree.
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 9 Jan 2006 19:18:33 +0000 (19:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Jan 2006 19:18:33 +0000 (19:18 +0000)
1  2 
arch/arm/Kconfig

Simple merge