Request pull: AppArmor updates

[Kees Cook]

The following changes since commit 2ebc9b9db7cfe124caf8836ec05da5fd3bb710af:
  Mario Limonciello (1):
        UBUNTU: Resolve sky2 race condition leading to failed suspends

are available in the git repository at:

  git://kernel.ubuntu.com/kees/ubuntu-hardy.git master

Kees Cook (1):
      UBUNTU: AppArmor: get latest batch of upstream fixes into Hardy (svn 1160)

 security/apparmor/apparmor.h   |    3 ++
 security/apparmor/apparmorfs.c |    2 +-
 security/apparmor/lsm.c        |    2 +
 security/apparmor/main.c       |   49 ++++++++++++++++++++++++++++-----------
 4 files changed, 41 insertions(+), 15 deletions(-)


This has been build, boot, and functionality tested already.

Thanks!

-- 
Kees Cook
Ubuntu Security Team