| commit | 911bc17eef923e45969a52fb37d705fc35fb6b9a | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 08:56:02 +0000 (11 09:56 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:23:17 +0000 (11 10:23 +0100) | ||
| tree | c1d915da8826f839736103b969259254e8f494af | treesnapshot (tar.gz zip) |
| parent | 09f2ab1bd148ace3ddc594e72dd998db581d91f4 | commitdiff |
| parent | 4b0c7aa3647d8d273395ff1e6176850e61f2d331 | commitdiff |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (3 commits)
microblaze: Fix loading of petalogix s3adsp1800 dtb.
Stellaris qdev conversion
Implement multiple samplers on stellaris ADC
Conflicts:
Makefile
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* 'master' of git://git.sv.gnu.org/qemu: (3 commits)
microblaze: Fix loading of petalogix s3adsp1800 dtb.
Stellaris qdev conversion
Implement multiple samplers on stellaris ADC
Conflicts:
Makefile
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |