From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Apr 2014 17:48:08 +0000 (-0700)
Subject: Merge tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... 
X-Git-Tag: v4.9.8~6526
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09df694a65895aa27cd12456ad5e45553e2520f6;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'fbdev-reorder-3.15' of git://git./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
---

09df694a65895aa27cd12456ad5e45553e2520f6