diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-06-11 09:56:02 +0100 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2009-06-11 10:23:17 +0100 |
commit | 911bc17eef923e45969a52fb37d705fc35fb6b9a (patch) | |
tree | c1d915da8826f839736103b969259254e8f494af /cpu-defs.h | |
parent | Merge branch 'master' of git://git.sv.gnu.org/qemu (diff) | |
parent | microblaze: Fix loading of petalogix s3adsp1800 dtb. (diff) | |
download | qemu-kvm-911bc17eef923e45969a52fb37d705fc35fb6b9a.tar.gz qemu-kvm-911bc17eef923e45969a52fb37d705fc35fb6b9a.tar.bz2 qemu-kvm-911bc17eef923e45969a52fb37d705fc35fb6b9a.zip |
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>
Diffstat (limited to 'cpu-defs.h')
0 files changed, 0 insertions, 0 deletions