From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 20:51:11 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: firefly_0821_release~3680^2~4801
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=250f8e3db646028353a2a737ddb7a894c97a1098;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sungem: fix compile failure caused by trivial #include consolidation
---

250f8e3db646028353a2a737ddb7a894c97a1098