diff options
| author |   Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
| commit | 017ed8012e74ca15748863f45d2c078453026a0a (patch) | |
| tree | 7071171a06de4e93fc890e0afce5c23596a26619 /lib/mpi/mpiutil.c | |
| parent | vmwgfx: information leak in vmw_execbuf_copy_fence_user() (diff) | |
| parent | Linux 3.1-rc10 (diff) | |
| download | linux-dev-017ed8012e74ca15748863f45d2c078453026a0a.tar.xz linux-dev-017ed8012e74ca15748863f45d2c078453026a0a.zip | |
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
Diffstat (limited to 'lib/mpi/mpiutil.c')
0 files changed, 0 insertions, 0 deletions