[PULL] 1.10 fixes

[Adam Jackson]

The following changes since commit 261d0d16af797bb52d4c778e220296d7f2b28e14:

  Fix asprintf typo in commit d2c42b10 (2010-12-31 13:07:24 +0000)

are available in the git repository at:
  ssh://people.freedesktop.org/~ajax/xserver for-keithp

Adam Jackson (1):
      x86emu: Fix more mis-decoding of the data prefix

Zhao Yakui (1):
      edid: Fix incorrect timings for VIC61

 hw/xfree86/modes/xf86EdidModes.c |    2 +-
 hw/xfree86/x86emu/ops.c          |   63 +++++++++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 19 deletions(-)

- ajax
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110104/45bd65ef/attachment.pgp>