Merge commit 'origin/master' into juha-devel
authorJuha Riihimäki <juhriihi@esdhcp035159.research.nokia.com>
Mon, 23 Mar 2009 10:48:13 +0000 (12:48 +0200)
committerJuha Riihimäki <juhriihi@esdhcp035159.research.nokia.com>
Mon, 23 Mar 2009 10:48:13 +0000 (12:48 +0200)
commit27c2dc3f46d245aa394588d3ac24707cb92ffa1e
treee9f6901d58eaccd7913149edd0150dde3cae1fb5
parent1efdda81ebe200353a96ee9f80bf6440418c48a5
parent1cdfbdf5640bf5905fbecae59d9ba5790824f60c
Merge commit 'origin/master' into juha-devel

Conflicts:
hw/beagle.c
hw/omap3.c
hw/usb-musb.c
hw/beagle.c
hw/usb-musb.c