diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-21 09:25:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-21 09:25:19 +1000 |
| commit | e902027a64589e53b6d6d7851438ffb4c65a572b (patch) | |
| tree | adb274698f6132713e7ee1cadc578dddfe3b9fb4 /drivers/scsi/mpt2sas/mpi/mpi2_raid.h | |
| parent | b46ce98d9393bf676a50455b3854988cdb64e562 (diff) | |
| parent | 7c4c55845ca40b56c9486064cc5c6d9b884d4d76 (diff) | |
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
This pull request includes below fixups,
- Remove duplicated machine checking.
. It seems that this code was added when you merged 'v3.18-rc7' into
drm-next. commit id : e8115e79aa62b6ebdb3e8e61ca4092cc32938afc
- Fix hdmiphy reset.
. Exynos hdmi has two interfaces to control hdmyphy, one is I2C, other
is APB bus - memory mapped I/O. So this patch makes hdmiphy reset
to be done according to interfaces, I2C or APB bus.
- And add some exception codes.
* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
drm/exynos: fix warning of vblank reference count
drm/exynos: remove unnecessary runtime pm operations
drm/exynos: fix reset codes for memory mapped hdmi phy
drm/exynos: remove the redundant machine checking code
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_raid.h')
0 files changed, 0 insertions, 0 deletions