From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Nov 2011 00:37:35 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
X-Git-Tag: v3.2-rc4~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8748dfae379573cdbea4e765b55e608a1764f918;p=~emulex%2Finfiniband.git

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

8748dfae379573cdbea4e765b55e608a1764f918