diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-07 23:30:03 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-10 22:36:52 +0200 |
| commit | 34dc4d4423dc342848d72be764832cbc0852854a (patch) | |
| tree | 056402a4afc2b7ef2f4dee30a712ce847279c13a /drivers/pcmcia/i82092.c | |
| parent | drm/i915: cleanup mode setting before unmapping registers (diff) | |
| parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarz... (diff) | |
| download | linux-34dc4d4423dc342848d72be764832cbc0852854a.tar.xz linux-34dc4d4423dc342848d72be764832cbc0852854a.zip | |
Merge remote branch 'origin/master' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c
The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
Diffstat (limited to 'drivers/pcmcia/i82092.c')
0 files changed, 0 insertions, 0 deletions