diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-17 10:48:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-17 10:48:08 -0700 |
| commit | 09df694a65895aa27cd12456ad5e45553e2520f6 (patch) | |
| tree | 833e8f9a742e8f5117ac8c0ac4717a554b07c7c2 /drivers/memstick | |
| parent | 6ca2a88ad820af56535ed1e6936e0490cb6ec6dc (diff) | |
| parent | 776bbb97e0a37fe67bd0870e5aa4845af856b872 (diff) | |
Merge tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev renaming patches from Tomi Valkeinen:
"Reorder drivers/video/ directory so that all fbdev drivers are now
located in drivers/video/fbdev/ and the fbdev framework core files are
located in drivers/video/fbdev/core/
The drivers/video/Kconfig is modified so that the DRM and the fbdev
menu options are in separate submenus, instead of both being mixed in
the same 'Graphics support' menu level"
* tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: Kconfig: move drm and fb into separate menus
fbdev: move fbdev core files to separate directory
video: move fbdev to drivers/video/fbdev
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions