Maverick pull request, drop preempt flavour, remove sub-flavors, add virtual flavour

[Tim Gardner]

The following changes since commit 3108c5784e934fecc2a8b16ff6a36df3c461bd40:
  Leann Ogasawara (1):
        UBUNTU: Ubuntu-2.6.34-3.10

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick.git flavours

Tim Gardner (4):
      UBUNTU: [Config] Added virtual flavour
      UBUNTU: [Config] Remove support for sub-flavours
      UBUNTU: [Config] Removed amd64 preempt flavour
      UBUNTU: [Config] updateconfigs, updateportsconfigs after flavour munging

 .../abi/2.6.34-2.9/amd64/{preempt => virtual}      | 1304 ++--
 .../amd64/{preempt.modules => virtual.modules}     |    8 +-
 debian.master/abi/2.6.34-2.9/i386/virtual          |11058 ++++++++++++++++++++
 .../preempt.modules => i386/virtual.modules}       |  231 +-
 debian.master/config/amd64/config.common.amd64     |    2 +
 debian.master/config/amd64/config.flavour.generic  |   10 -
 debian.master/config/amd64/config.flavour.preempt  |   26 -
 debian.master/config/amd64/config.flavour.server   |   10 -
 debian.master/config/amd64/config.flavour.virtual  |   16 +
 debian.master/config/armel/config.common.armel     |    7 -
 debian.master/config/config.common.ubuntu          |   10 +-
 debian.master/config/i386/config.common.i386       |    8 -
 debian.master/config/i386/config.flavour.virtual   |   18 +
 .../control.d/{vars.preempt => vars.virtual}       |    8 +-
 debian.master/d-i/kernel-versions.in               |    2 +
 debian.master/etc/getabis                          |    4 +-
 debian.master/rules.d/amd64.mk                     |    5 +-
 debian.master/rules.d/i386.mk                      |    5 +-
 debian.master/sub-flavours/README                  |   12 -
 debian.master/sub-flavours/control.stub            |   39 -
 debian.master/sub-flavours/virtual.list            |  107 -
 debian.master/sub-flavours/virtual.vars            |   10 -
 debian/rules.d/2-binary-arch.mk                    |   35 -
 debian/scripts/sub-flavour                         |   67 -
 24 files changed, 11977 insertions(+), 1025 deletions(-)
 rename debian.master/abi/2.6.34-2.9/amd64/{preempt => virtual} (94%)
 copy debian.master/abi/2.6.34-2.9/amd64/{preempt.modules => virtual.modules} (99%)
 create mode 100644 debian.master/abi/2.6.34-2.9/i386/virtual
 rename debian.master/abi/2.6.34-2.9/{amd64/preempt.modules => i386/virtual.modules} (92%)
 delete mode 100644 debian.master/config/amd64/config.flavour.preempt
 create mode 100644 debian.master/config/amd64/config.flavour.virtual
 create mode 100644 debian.master/config/i386/config.flavour.virtual
 rename debian.master/control.d/{vars.preempt => vars.virtual} (56%)
 delete mode 100644 debian.master/sub-flavours/README
 delete mode 100644 debian.master/sub-flavours/control.stub
 delete mode 100644 debian.master/sub-flavours/virtual.list
 delete mode 100644 debian.master/sub-flavours/virtual.vars
 delete mode 100644 debian/scripts/sub-flavour