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)
commit8748dfae379573cdbea4e765b55e608a1764f918
treed67f5c0ddd3a63481b14cd327779eeaf0bc165e9
parenta34815b96f9a21b3a2e2912dfd0d994acd2855e3
parenteee628da2ee3cbba6f14696278c92a464239eea6
Merge branch 'for-linus' of git://git./linux/kernel/git/aegl/linux

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  efivars: add missing parameter to efi_pstore_read()