Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (139 commits)
  make: Remove duplicate use of GLIB_CFLAGS
  ARM devboards: Set arm_sysctl properties before init, not after
  Restore consistent formatting
  w32: Initialise critical section before starting thread (fix #922131)
  w32: Build windows and console executables
  qdev: remove unused fields from PropertyInfo
  qdev: initialize properties via QOM
  qdev: inline qdev_prop_set into qdev_prop_set_ptr
  qdev: access properties via QOM
  qdev: fix off-by-one
  qdev: let QOM free properties
  qdev: remove parse/print methods for pointer properties
  qdev: make the non-legacy pci address property accept an integer
  qdev: remove parse/print methods for mac properties
  qdev: remove print/parse methods from LostTickPolicy properties
  qdev: remove parse method for string properties
  qdev: allow reusing get/set for legacy property
  qdev: remove direct calls to print/parse
  qom: add property get/set wrappers for links
  qom: fix canonical paths vs. interfaces
  ...

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