diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 09:12:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 09:12:38 -0800 |
| commit | be4773e6a11a0cc1e63c9c32f000b870e51b8c01 (patch) | |
| tree | b37b326da54cdbbf6ea31e6b0184c8dfdc113f78 /fs/ceph/caps.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | Merge branch 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next (diff) | |
| download | linux-dev-be4773e6a11a0cc1e63c9c32f000b870e51b8c01.tar.xz linux-dev-be4773e6a11a0cc1e63c9c32f000b870e51b8c01.zip | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm sti driver updates from Dave Airlie:
"The sti driver had a requirement on some patches in Greg's tree, they
are in, so I see no problems just merging this one now"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
drm/sti: load HQVDP firmware the first time HQVDP's plane is used
drm/sti: fix typo issue in sti_mode_config_init
drm/sti: set mixer background color through module param
drm/sti: Remove local fbdev emulation Kconfig option
drm/sti: remove redundant sign extensions
drm/sti: hdmi use of_get_i2c_adapter_by_node interface
drm/sti: hdmi fix i2c adapter device refcounting
drm/sti: Do not export symbols
drm/sti: Build monolithic driver
drm/sti: Use drm_crtc_vblank_*() API
drm/sti: Store correct CRTC index in events
drm/sti: Select FW_LOADER
drm/sti: Constify function pointer structs
Diffstat (limited to 'fs/ceph/caps.c')
0 files changed, 0 insertions, 0 deletions