diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:17:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:17:04 -0500 |
| commit | f8abea8f8c24ecdad6d6861bffb912f23f2741cd (patch) | |
| tree | 7d5af9c3d92b3afd0d585aabd6537db36c8095ae /arch/arm | |
| parent | ef29498655b18d2bfd69048e20835d19333981ab (diff) | |
| parent | 1c14cfbbe7a9f2240c73f420c3c6336fc521cd64 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] allow drm populated agp memory types cleanups
[AGPGART] intel-agp: Use ARRAY_SIZE macro when appropriate
[AGPGART] Add agp-type-to-mask-type method missing from some drivers.
[AGPGART] Don't try to remap i810 registers on resume.
[AGPGART] Allow drm-populated agp memory types
[AGPGART] compat ioctl
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions