diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 17:08:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 17:08:16 -0800 |
commit | 6602b355c2cf8f4c628732827408606075288d28 (patch) | |
tree | 28b4f6fb17f8bf91aee5a112ad468d009467c09a /security/keys/keyctl.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff) | |
parent | agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge() (diff) | |
download | linux-dev-6602b355c2cf8f4c628732827408606075288d28.tar.xz linux-dev-6602b355c2cf8f4c628732827408606075288d28.zip |
Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp/intel-agp: Set dma_mask for capable chipsets before agp_add_bridge()
Diffstat (limited to 'security/keys/keyctl.c')
0 files changed, 0 insertions, 0 deletions