diff options
| author | Linus Torvalds | 2011-06-28 11:15:57 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-06-28 11:15:57 -0700 |
| commit | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (patch) | |
| tree | b2777db7513e14b0341088eea96c869a8071abc4 /drivers/scsi/sr_ioctl.c | |
| parent | c89b857ce6d803905b2c9d71bc9effdd286c45ed (diff) | |
| parent | f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3 (diff) | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: Use chipset-specific irq installers
drm/i915: forcewake fix after reset
drm/i915: add Ivy Bridge page flip support
drm/i915: split page flip queueing into per-chipset functions
Diffstat (limited to 'drivers/scsi/sr_ioctl.c')
0 files changed, 0 insertions, 0 deletions