From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 07:18:39 +0000 (-1000)
Subject: Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: firefly_0821_release~3680^2~4770
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f48d1915b86f06a943087e5f9b29542a1ef4cd4d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pstore-efi' of git://git./linux/kernel/git/aegl/linux-2.6

* 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  efivars: fix warnings when CONFIG_PSTORE=n
---

f48d1915b86f06a943087e5f9b29542a1ef4cd4d