Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 20:51:11 +0000 (10:51 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 20:51:11 +0000 (10:51 -1000)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sungem: fix compile failure caused by trivial #include consolidation


Trivial merge