]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 20 Mar 2006 13:50:53 +0000 (05:50 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Mar 2006 13:50:53 +0000 (05:50 -0800)
1  2 
Makefile
arch/arm/Kconfig

diff --cc Makefile
Simple merge
Simple merge