[Maverick][pull request] sync to AppArmor mainline 2010-07-23

[John Johansen]

The following changes since commit 29397d7109620c128d4a27699b7de460961f2aaf:
  Leann Ogasawara (1):
        UBUNTU: Ubuntu-2.6.35-12.17

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-maverick.git apparmor

John Johansen (3):
      UBUNTU: SAUCE: AppArmor: -- sync to AppArmor mainline 2010-07-23
      UBUNTU: SAUCE: AppArmor 2.4 compatibility patch
      UBUNTU: SAUCE: AppArmor: Allow dfa backward compatibility with broken userspace

 include/linux/lsm_audit.h              |    8 +-
 security/apparmor/apparmorfs-24.c      |    2 +-
 security/apparmor/apparmorfs.c         |   59 ++----------------
 security/apparmor/audit.c              |   59 +++++++++++--------
 security/apparmor/capability.c         |   12 ++--
 security/apparmor/context.c            |    4 +-
 security/apparmor/domain.c             |   36 ++++++------
 security/apparmor/file.c               |   59 +++++--------------
 security/apparmor/include/apparmor.h   |   27 ++++++---
 security/apparmor/include/apparmorfs.h |    3 -
 security/apparmor/include/audit.h      |    8 +--
 security/apparmor/include/domain.h     |    2 +-
 security/apparmor/include/file.h       |   39 +++++-------
 security/apparmor/include/match.h      |    7 --
 security/apparmor/include/path.h       |    1 -
 security/apparmor/include/policy.h     |   28 ++++-----
 security/apparmor/include/procattr.h   |    2 +-
 security/apparmor/ipc.c                |    8 +-
 security/apparmor/lib.c                |   87 +++++++++++++++++++++-------
 security/apparmor/lsm.c                |  101 +++++++++++--------------------
 security/apparmor/match.c              |   85 +++++++++++----------------
 security/apparmor/net.c                |    8 ++-
 security/apparmor/path.c               |   88 +++++++++++++---------------
 security/apparmor/policy.c             |   68 ++++++++++++---------
 security/apparmor/policy_unpack.c      |   64 ++++++++++----------
 security/apparmor/procattr.c           |    9 ++-
 security/apparmor/resource.c           |   12 ++--
 27 files changed, 408 insertions(+), 478 deletions(-)