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)
commit8d5c315059460e665c804d5a9b641f7f0a1e9dd7
treeb9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df
parenta9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0
parent3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f
Merge master.kernel.org:/home/rmk/linux-2.6-arm
arch/arm/Kconfig