Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (221 commits)
  sm501: fix screen redraw
  checkpatch: adjust to QEMUisms
  Add checkpatch.pl from Linux kernel
  Add scripts directory
  gt64xxx: set isa_mem_base during registration
  hw/pl190.c: Fix writing of default vector address
  target-ppc: fix wrong NaN tests
  target-ppc: fix sNaN propagation
  pci: use qemu_malloc() in pcibus_get_dev_path()
  msix: simplify write config
  msi: simplify write config a bit.
  pci: deassert intx on reset.
  pxa2xx_lcd: restore updating of display
  pxa2xx: fix vmstate_pxa2xx_i2c
  scoop: fix access to registers from second instance
  mainstone: fix name of the allocated memory for roms
  add bepo (french dvorak) keyboard layout
  stc91c111: Implement save/restore
  pl080: Implement save/restore
  pl110: Implement save/restore
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>