[PULL] Minor 1.10 fixes

[Adam Jackson]

The following changes since commit e7dc253452a1ba64718a08fdc070405b494f53cd:

  Merge remote branch 'alanc/master' (2010-12-20 00:48:45 -0800)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver for-keithp

Adam Jackson (6):
      xfree86: Remove unused xf86inSuspend
      Remove SCO support
      fonts: Fix typo in async ListFonts logic
      xfree86: Symmetrize xf86AccessEnter and xf86AccessLeave
      xfree86: Remove xf86EnterServerState
      xfree86: Convert some xf86BlockSIGIO to OsBlockSignals

 Xext/xf86bigfont.c                    |    2 +-
 configure.ac                          |    1 -
 dix/dixfonts.c                        |    2 +-
 hw/xfree86/common/Makefile.am         |    1 -
 hw/xfree86/common/compiler.h          |   13 --
 hw/xfree86/common/scoasm.h            |  142 ----------------
 hw/xfree86/common/xf86.h              |    2 -
 hw/xfree86/common/xf86Bus.c           |   35 ----
 hw/xfree86/common/xf86Configure.c     |   21 +---
 hw/xfree86/common/xf86Cursor.c        |    6 +-
 hw/xfree86/common/xf86Events.c        |   13 +-
 hw/xfree86/common/xf86Globals.c       |    1 -
 hw/xfree86/common/xf86Init.c          |   25 +--
 hw/xfree86/common/xf86PM.c            |   23 +--
 hw/xfree86/common/xf86Priv.h          |    1 -
 hw/xfree86/common/xf86str.h           |    7 -
 hw/xfree86/ddc/ddc.c                  |   11 +-
 hw/xfree86/int10/helper_exec.c        |    5 +-
 hw/xfree86/loader/loader.c            |   20 ---
 hw/xfree86/loader/os.c                |    2 -
 hw/xfree86/os-support/Makefile.am     |    2 +-
 hw/xfree86/os-support/sco/Makefile.am |    5 -
 hw/xfree86/os-support/sco/VTsw_sco.c  |  127 --------------
 hw/xfree86/os-support/sco/sco_init.c  |  294 ---------------------------------
 hw/xfree86/os-support/sco/sco_iop.c   |   90 ----------
 hw/xfree86/os-support/sco/sco_video.c |  290 --------------------------------
 hw/xfree86/os-support/xf86_OSlib.h    |   31 +----
 os/access.c                           |   12 +-
 os/osinit.c                           |    5 +-
 29 files changed, 39 insertions(+), 1150 deletions(-)
 delete mode 100644 hw/xfree86/common/scoasm.h
 delete mode 100644 hw/xfree86/os-support/sco/Makefile.am
 delete mode 100644 hw/xfree86/os-support/sco/VTsw_sco.c
 delete mode 100644 hw/xfree86/os-support/sco/sco_init.c
 delete mode 100644 hw/xfree86/os-support/sco/sco_iop.c
 delete mode 100644 hw/xfree86/os-support/sco/sco_video.c

- 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/20101220/fd166950/attachment.pgp>