aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 18:40:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 18:40:54 -0700
commit826456989f1e9fe15daf2183c630ea9c7ab7c46d (patch)
treefa5dec62b73dfad09ad49f1e2797a0e303bd194b /drivers/gpu/drm/i915/intel_drv.h
parentcorrect console log level when ERST ACPI table is not found (diff)
parentata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1 (diff)
downloadlinux-dev-826456989f1e9fe15daf2183c630ea9c7ab7c46d.tar.xz
linux-dev-826456989f1e9fe15daf2183c630ea9c7ab7c46d.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata_generic: implement ATA_GEN_* flags and force enable DMA on MBP 7,1 ahci,ata_generic: let ata_generic handle new MBP w/ MCP89 libahci: Fix bug in storing EM messages
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
0 files changed, 0 insertions, 0 deletions