[PULL][saucy] apparmor 3 alpha4 sync

[John Johansen]

The following changes since commit 7a301801d1ebd09faa5b1a3d671dc4316220086f:

  UBUNTU: Ubuntu-3.11.0-2.5 (2013-08-12 09:46:40 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-saucy.git aa3.0

for you to fetch changes up to 3eb223f3ad4d8dba5d0c22b470a10edaf4e72b7f:

  UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-14 20:37:33 -0700)

----------------------------------------------------------------
John Johansen (3):
      Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot"
      Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users"
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot

 debian.master/config/config.common.ubuntu |   1 +
 security/apparmor/Kconfig                 |  12 +
 security/apparmor/Makefile                |  31 +-
 security/apparmor/apparmorfs.c            |  55 ++-
 security/apparmor/audit.c                 |  44 +--
 security/apparmor/capability.c            |  13 +-
 security/apparmor/crypto.c                |  97 +++++
 security/apparmor/domain.c                |   2 +-
 security/apparmor/file.c                  |  38 +-
 security/apparmor/include/apparmorfs.h    |   1 +
 security/apparmor/include/audit.h         |   3 +-
 security/apparmor/include/capability.h    |   4 +
 security/apparmor/include/crypto.h        |  36 ++
 security/apparmor/include/file.h          |   4 +-
 security/apparmor/include/label.h         |  17 +-
 security/apparmor/include/policy.h        |   4 +-
 security/apparmor/ipc.c                   |   4 +-
 security/apparmor/label.c                 | 597 ++++--------------------------
 security/apparmor/lib.c                   |   7 +-
 security/apparmor/lsm.c                   |  28 +-
 security/apparmor/mount.c                 |  40 +-
 security/apparmor/net.c                   |  26 +-
 security/apparmor/policy.c                |  36 +-
 security/apparmor/policy_unpack.c         |  48 ++-
 security/apparmor/resource.c              |   4 +-
 25 files changed, 439 insertions(+), 713 deletions(-)
 create mode 100644 security/apparmor/crypto.c
 create mode 100644 security/apparmor/include/crypto.h