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)
commit0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3
tree92f55e374a84d06ce8213a4540454760fdecf137
parent8ef12c9f01afba47c2d33bb939085111ca0d0f7d
parent5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f
Merge Linus' tree.
arch/arm/Kconfig