diff options
| author |   Dave Airlie <airlied@redhat.com> | 2009-10-08 14:03:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-10-08 14:03:05 +1000 |
| commit | c1176d6f03e1085797ce83648a2c76ae15a2b515 (patch) | |
| tree | f9796cf97a6fbc75a486b1e4f6406d1f8f599a48 /mm/vmalloc.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (diff) | |
| parent | drm/radeon/kms: fix vline register for second head. (diff) | |
| download | wireguard-linux-c1176d6f03e1085797ce83648a2c76ae15a2b515.tar.xz wireguard-linux-c1176d6f03e1085797ce83648a2c76ae15a2b515.zip | |
Merge branch 'drm-next' of ../drm-next into drm-linus
conflict in radeon since new init path merged with vga arb code.
Conflicts:
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_device.c
Diffstat (limited to 'mm/vmalloc.c')
0 files changed, 0 insertions, 0 deletions