diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-04 17:31:08 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-04 17:31:08 -0500 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /Documentation/apparmor.txt | |
| parent | 204663c48711ddceee09df46269cd34d49d1f7be (diff) | |
| parent | 989d873fc5b6a96695b97738dea8d9f02a60f8ab (diff) | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
Diffstat (limited to 'Documentation/apparmor.txt')
0 files changed, 0 insertions, 0 deletions