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 /fs/binfmt_elf_fdpic.c | |
| parent | 0eca52a92735f43462165efe00a7e394345fb38e (diff) | |
| parent | d4ac6a05d51357e31028cc9076874a58dd197b83 (diff) | |
| download | linux-3.10-c1176d6f03e1085797ce83648a2c76ae15a2b515.tar.gz linux-3.10-c1176d6f03e1085797ce83648a2c76ae15a2b515.tar.bz2 linux-3.10-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 'fs/binfmt_elf_fdpic.c')
0 files changed, 0 insertions, 0 deletions