Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 00:37:35 +0000 (16:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 00:37:35 +0000 (16:37 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  efivars: add missing parameter to efi_pstore_read()


Trivial merge