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-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f48d1915b86f06a943087e5f9b29542a1ef4cd4d;p=openwrt%2Fstaging%2Fblogic.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