Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 16:15:55 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 16:15:55 +0000 (09:15 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  x86 platform drivers: Build fix for intel_pmic_gpio


Trivial merge