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)
commit250f8e3db646028353a2a737ddb7a894c97a1098
tree1a92e2b11faf832923fe1a42ec25d19c2957ec75
parent464c9098bbc17b4596aa12191a7e646a28e7587a
parent5903417cd66d87a126f5cf27a846fc0985093f06
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