diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 19:19:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 19:19:14 +0400 |
| commit | 18367c0ec73671fbfea35f13ae52d39437c53eb5 (patch) | |
| tree | a6489aee6b0240834d82d088286731b61cec1979 /mm/huge_memory.c | |
| parent | 81de916f19cf5f1437c0b9ed817364f0f7c81961 (diff) | |
| parent | 805c22168da76a65c978017d0fe0d59cd048e995 (diff) | |
| download | linux-18367c0ec73671fbfea35f13ae52d39437c53eb5.tar.xz | |
Merge branch 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: disable hdmi audio by default
drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu
drm/radeon/kms: set family for use in parser.
Diffstat (limited to 'mm/huge_memory.c')
0 files changed, 0 insertions, 0 deletions