Merge remote branch 'origin/master' into pci

Conflicts:
	exec.c

diff --cc cpu-common.h
Simple merge

diff --cc exec.c
index 0c773a8ad9aa8d6d80136f052381e57cb909691a,a718d747e77d5ce54a10e7e5101f7f8d4f256586..308a86dcc021b94c99a099e36f381af2c19a58a7
--- 1/exec.c
--- 2/exec.c
+++ b/exec.c
@@@ -2621,7 -2618,8 +2628,8 @@@ void cpu_register_physical_memory_log(t
      ram_addr_t orig_size = size;
      subpage_t *subpage;
  
 -    cpu_notify_set_memory(start_addr, size, phys_offset);
+     assert(size);
 +    cpu_notify_set_memory(start_addr, size, phys_offset, log_dirty);
  
      if (phys_offset == IO_MEM_UNASSIGNED) {
          region_offset = start_addr;

diff --cc hw/eepro100.c
Simple merge

diff --cc hw/ide/ich.c
Simple merge

diff --cc hw/lsi53c895a.c
Simple merge

diff --cc hw/pcnet-pci.c
Simple merge

diff --cc hw/rtl8139.c
Simple merge

diff --cc hw/usb-ohci.c
Simple merge

diff --cc kvm-all.c
Simple merge