diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 02:37:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 02:37:20 +0100 |
| commit | 09fd671ccb2475436bd5f597f751ca4a7d177aea (patch) | |
| tree | 44e1b7bad93a9107a1335c134a328e934349a8eb /net/ceph/armor.c | |
| parent | Merge tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | xen kconfig: don't "select INPUT_XEN_KBDDEV_FRONTEND" (diff) | |
| download | linux-09fd671ccb2475436bd5f597f751ca4a7d177aea.tar.xz linux-09fd671ccb2475436bd5f597f751ca4a7d177aea.zip | |
Merge tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
- Miscallaneous small fixes to various fbdev drivers
- Remove fb_rotate, which was never used
- pmag fb improvements
* tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (21 commits)
xen kconfig: don't "select INPUT_XEN_KBDDEV_FRONTEND"
video: fbdev: sis: remove unused variable
drivers/video: make fbdev/sunxvr2500.c explicitly non-modular
drivers/video: make fbdev/sunxvr1000.c explicitly non-modular
drivers/video: make fbdev/sunxvr500.c explicitly non-modular
video: exynos: fix modular build
fbdev: da8xx-fb: fix videomodes of lcd panels
fbdev: kill fb_rotate
video: fbdev: bt431: Correct cursor format control macro
video: fbdev: pmag-ba-fb: Optimize Bt455 colormap addressing
video: fbdev: pmag-ba-fb: Fix and rework Bt455 colormap handling
video: fbdev: bt455: Remove unneeded colormap helpers for cursor support
video: fbdev: pmag-aa-fb: Report video timings
video: fbdev: pmag-aa-fb: Enable building as a module
video: fbdev: pmag-aa-fb: Adapt to current APIs
video: fbdev: pmag-ba-fb: Fix the lower margin size
fbdev: sh_mobile_lcdc: Use ARCH_RENESAS
fbdev: n411: check return value
fbdev: exynos: fix IS_ERR_VALUE usage
video: Use bool instead int pointer for get_opt_bool() argument
...
Diffstat (limited to 'net/ceph/armor.c')
0 files changed, 0 insertions, 0 deletions