Merge branch 'cn68xx-ciu2' of git://git.linux-mips.org/pub/scm/daney/upstream-daney...
Ralf Baechle [Thu, 27 Sep 2012 16:00:07 +0000 (18:00 +0200)]
1  2 
arch/mips/Kconfig

Simple merge