[LUCID] request-pull AppArmor: update to latest upstreaming version

[John Johansen]

The following changes since commit 8bd75cee3bd4b4f231dc189c8ff2cda2641e1307:
  Manoj Iyer (1):
        UBUNTU: [Config] added CONFIG_RTL8192SE module.

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-lucid.git master

John Johansen (4):
      UBUNTU: ubuntu: AppArmor -- update to mainline 2010-03-04
      UBUNTU: SAUCE: AppArmor: Reintroduce AppArmor 2.4 compatibility
      UBUNTU: SAUCE: AppArmor: replace strim with strstrip for 2.6.32 kernels
      UBUNTU: [Config] Remove AppArmor config options that no longer exist

 debian.master/config/config.common.ubuntu |    2 -
 security/apparmor/Kconfig                 |   26 +-----
 security/apparmor/Makefile                |    3 +-
 security/apparmor/apparmorfs.c            |   87 +++++++++++++---
 security/apparmor/audit.c                 |   17 +++-
 security/apparmor/capability.c            |   32 +++++-
 security/apparmor/context.c               |   55 ++++++++---
 security/apparmor/domain.c                |  114 +++++++++++++++------
 security/apparmor/file.c                  |  133 ++++++++++++++++++++++---
 security/apparmor/include/apparmor.h      |    1 +
 security/apparmor/include/context.h       |   42 +++++---
 security/apparmor/include/file.h          |    8 +-
 security/apparmor/include/match.h         |    7 ++
 security/apparmor/include/policy.h        |   26 ++++-
 security/apparmor/include/sid.h           |   23 +----
 security/apparmor/ipc.c                   |   25 +++++-
 security/apparmor/lib.c                   |   23 ++++-
 security/apparmor/lsm.c                   |  108 +++++++++-----------
 security/apparmor/match.c                 |   71 ++++++++++----
 security/apparmor/net.c                   |   28 +++++-
 security/apparmor/path.c                  |  100 ++++++++++++-------
 security/apparmor/policy.c                |  153 ++++++++++++++++------------
 security/apparmor/policy_unpack.c         |   51 +++++++---
 security/apparmor/procattr.c              |   30 +++++-
 security/apparmor/resource.c              |   19 +++-
 security/apparmor/sid.c                   |   25 +----
 26 files changed, 822 insertions(+), 387 deletions(-)