summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-legacy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-07 15:47:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-07 15:47:47 -0700
commitf56cfe0c35fd3419a0f5230e3638f9fe53f17c42 (patch)
treec14f83098e257487e41601c38ce4d5d82321a563 /drivers/ide/ide-legacy.c
parent8a207d3e84535e9de14cee59bcf0ea3ede61aca8 (diff)
parent995c376e89992e756cf844b86209eb4ceb5ebe27 (diff)
downloadlinux-f56cfe0c35fd3419a0f5230e3638f9fe53f17c42.tar.gz
Merge branch 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux
Pull radeon mullins support from Dave Airlie: "This is support for the new AMD mullins APU, it pretty much just adds support to the driver in the all the right places, and is pretty low risk wrt other GPUs" Oh well. I guess it ends up fitting under "support new hardware" for merging late. * 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux: drm/radeon: add pci ids for Mullins drm/radeon: add Mullins VCE support drm/radeon: modesetting updates for Mullins. drm/radeon: dpm updates for KV/KB drm/radeon: add Mullins dpm support. drm/radeon: add Mullins UVD support. drm/radeon: update cik init for Mullins. drm/radeon: add Mullins chip family
Diffstat (limited to 'drivers/ide/ide-legacy.c')
0 files changed, 0 insertions, 0 deletions