espes ff3f9be0e2 Merge tag 'v1.6.0' into xbox ... Conflicts: block/Makefile.objs configure hw/Makefile.objs hw/audio/ac97.c hw/i386/Makefile.objs hw/ide/core.c ui/console.c		2013-08-19 22:46:10 +10:00
..
i2c.h	hw: move headers to include/	2013-04-08 18:13:10 +02:00
pm_smbus.h	hw: move headers to include/	2013-04-08 18:13:10 +02:00
smbus.h	Merge tag 'v1.6.0' into xbox	2013-08-19 22:46:10 +10:00