Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:34:31 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:34:31 +0000 (10:34 -0700)
1  2 
arch/arm/Kconfig

Simple merge