[PATCH 0/2] more agressive kernel config merging

[Andy Whitcroft]

This patch set implements the more agressive kernel config merging as
described in the thread below:

    Subject: More agressive kernel configuration merges

The first patch is the guts of the change.  The second is an example
of the effect on the configs.  We are not proposing to merge that at
this time as it would conflict with the ongoing flavour changes.

-apw

Andy Whitcroft (2):
  UBUNTU: merge kernel configs more agressivly
  UBUNTU: [Config] updateconfigs using new more agressive merge

 debian/config/amd64/config.common.amd64    | 2421 -----------------------
 debian/config/amd64/config.flavour.generic |    2 -
 debian/config/armel/config.common.armel    |  181 --
 debian/config/config.common.ubuntu         | 2895 ++++++++++++++++++++++++++++
 debian/config/i386/config.common.i386      | 2669 +-------------------------
 debian/config/i386/config.flavour.generic  |   38 -
 debian/config/lpia/config.common.lpia      | 2276 ----------------------
 debian/scripts/misc/kernelconfig           |   14 +-
 debian/scripts/misc/splitconfig.pl         |   21 +-
 9 files changed, 2935 insertions(+), 7582 deletions(-)