pull-request: fix regression in NFS on AUFS from AppArmor merge

[Kees Cook]

The following changes since commit ee9f8ae0cbcb0fc6507dcd25e5376b7a5b041c79:
  Tim Gardner (1):
        UBUNTU: [PATCH] fix virtio udeb layout

are available in the git repository at:

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

Michael Haas (1):
      UBUNTU: SAUCE: Revert aufs changes from AppArmor merge

 ubuntu/aufs/dir.c   |    1 -
 ubuntu/aufs/f_op.c  |    1 -
 ubuntu/aufs/i_op.c  |   25 +++++++++++--------------
 ubuntu/aufs/inode.h |    1 -
 ubuntu/aufs/misc.c  |    5 +++--
 ubuntu/aufs/vfsub.c |   17 +++++------------
 ubuntu/aufs/vfsub.h |    2 --
 7 files changed, 19 insertions(+), 33 deletions(-)

-- 
Kees Cook
Ubuntu Security Team