Merge branch 'devel-stable' into devel
[linux-3.10.git] / arch / arm / mach-integrator / Kconfig
2005-04-16 Linus Torvalds Linux-2.6.12-rc2 master