]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Manual merge to avoid conflicts
authorTony Lindgren <tony@atomide.com>
Mon, 20 Jun 2005 20:57:17 +0000 (13:57 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Jun 2005 20:57:17 +0000 (13:57 -0700)
commitce016ca206b225a332948e3c4c926581e5d3e122
tree85185efe51bee95472821dc954cbfcfe0d74c8b4
parent0e3c41b155e5cf9715bf9b3d928d0fd9f2fa66a3
Manual merge to avoid conflicts
arch/arm/Kconfig