From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Dec 2008 23:53:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: firefly_0821_release~16625
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d279dcf98350ac3cbfa43c6aa62f4305408f2df;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for 2.6.28-rc7
  macfb: Do not overflow fb_fix_screeninfo.id
---

5d279dcf98350ac3cbfa43c6aa62f4305408f2df