Merge branch 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:44:23 +0000 (16:44 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:44:23 +0000 (16:44 -1000)
commit8b6b4628126fd73d0a53b499a26133c15b73c1e6
treed5ae977face87faefbcd7487d118d99485107227
parentf03683b8fb7e03862d2f1366a16c1b01732a5741
parent1eb9a4b8a3c8a141cf2ab27309f089923b69c707
Merge branch 'fixefi' of git://git./linux/kernel/git/aegl/linux-2.6

* 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  efi: Fix argument types for SetVariable() for ia64