tree d5ae977face87faefbcd7487d118d99485107227
parent f03683b8fb7e03862d2f1366a16c1b01732a5741
parent 1eb9a4b8a3c8a141cf2ab27309f089923b69c707
author Linus Torvalds <torvalds@linux-foundation.org> 1312512263 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312512263 -1000

Merge branch 'fixefi' of git://git.kernel.org/pub/scm/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