[karmic] request-pull

[Tim Gardner]

John Johansen wrote:
> The following changes since commit f25ce537a004c2731135502e079b0a24fa5a22e1:
>   Stefan Bader (1):
>         UBUNTU: [Upstream] acpi: video: Loosen strictness of video bus detection
> code
> 
> are available in the git repository at:
> 
>   kernel.ubuntu.com:/srv/kernel.ubuntu.com/git/jj/apparmor-karmic.git master
> 
> John Johansen (6):
>       UBUNTU: SAUCE: Fix profile attachment for regexp based profile names
> BugLink: http://bugs.launchpad.net/bugs/419308
>       UBUNTU: SAUCE: Return the correct error codes on profile addition/removal
> BugLink: http://bugs.launchpad.net/bugs/408473
>       UBUNTU: SAUCE: Fix OOPS in profile listing, and display full list BugLink:
> http://bugs.launchpad.net/bugs/408454
>       UBUNTU: SAUCE: Fix mapping of pux to new internal permission format
> BugLink: http://bugs.launchpad.net/bugs/419222
>       UBUNTU: SAUCE: Fix change_profile failure BugLink:
> http://bugs.launchpad.net/bugs/401931
>       UBUNTU: SAUCE: Tell git to ignore generated include files BugLink:
> http://bugs.launchpad.net/bugs/419505
> 
>  ubuntu/apparmor/.gitignore         |    5 +++++
>  ubuntu/apparmor/apparmorfs.c       |   34 +++++++++++++++-------------------
>  ubuntu/apparmor/domain.c           |   18 ++++++++++++------
>  ubuntu/apparmor/file.c             |    2 +-
>  ubuntu/apparmor/include/file.h     |    2 ++
>  ubuntu/apparmor/include/policy.h   |    2 +-
>  ubuntu/apparmor/policy.c           |   16 +++++++++-------
>  ubuntu/apparmor/policy_interface.c |    4 ++--
>  8 files changed, 47 insertions(+), 36 deletions(-)
>  create mode 100644 ubuntu/apparmor/.gitignore
> 

applied

-- 
Tim Gardner tim.gardner at canonical.com