Merge commit 'origin/upstream' into juha-devel
authorJuha Riihimäki <juhriihi@esdhcp035153.research.nokia.com>
Thu, 2 Apr 2009 09:11:11 +0000 (12:11 +0300)
committerJuha Riihimäki <juhriihi@esdhcp035153.research.nokia.com>
Thu, 2 Apr 2009 09:11:11 +0000 (12:11 +0300)
1  2 
Makefile.target
hw/omap.h

diff --cc Makefile.target
Simple merge
diff --cc hw/omap.h
Simple merge