diff options
| author | Dave Airlie <airlied@gmail.com> | 2013-09-05 17:48:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-09-05 17:48:04 +1000 |
| commit | 86a7e1224a68511d3a1ae0b7e11581b9d37723ae (patch) | |
| tree | 3126603ede6689f51dd9ef15a948b2cc5f4914c8 /net/ipv4/sysctl_net_ipv4.c | |
| parent | 3b28802e37bb1ca1cab584f679c42e72a7e384f8 (diff) | |
| parent | 6914262aa52ec2d23dd2cc9e439874ca1917cf82 (diff) | |
Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-nextdrm-next
Summary:
- Consider fallback option to gem allocation fail
. try to allocate physically non-contiguous memory
if iommu is supported when physically contiguous memory allocation
failed.
- Add runtime pm support to g2d driver
- Add device tree support
. add device tree support to rotator driver, make fimd driver get
signal polarities from device tree.
- some fixups
. correct pixel format setting to fimd driver, and consider pixel
format checking to a particular window layer.
- some cleanups
. replace fb_videomode with videomode.
. remove non-DT support
* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (21 commits)
drm/exynos: Fix build error with exynos_drm_connector.c
drm/exynos: Remove non-DT support in exynos_drm_fimd
drm/exynos: Remove non-DT support in exynos_hdmi
drm/exynos: Remove non-DT support in exynos_drm_g2d
drm/exynos: Remove non-DT support in exynos_hdmiphy
drm/exynos: Remove non-DT support in exynos_ddc
drm/exynos: Make Exynos DRM drivers depend on OF
drm/exynos: Consider fallback option to allocation fail
drm/exynos: fimd: move platform data parsing to separate function
drm/exynos: fimd: get signal polarities from device tree
drm/exynos: fimd: replace struct fb_videomode with videomode
drm/exynos: check a pixel format to a particular window layer
drm/exynos: fix fimd pixel format setting
drm/exynos: Add NULL pointer check
drm/exynos: Remove redundant error messages
drm/exynos: Add missing of.h header include
drm/exynos: Remove redundant NULL check in exynos_drm_buf
drm/exynos: add device tree support for rotator
drm/exynos: Add missing includes
drm/exynos: add runtime pm interfaces to g2d driver
...
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
0 files changed, 0 insertions, 0 deletions