Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 03:43:21 +0000 (19:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 03:43:21 +0000 (19:43 -0800)
1  2 
arch/arm/Kconfig

Simple merge