Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 07:18:39 +0000 (21:18 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 07:18:39 +0000 (21:18 -1000)
commitf48d1915b86f06a943087e5f9b29542a1ef4cd4d
tree86b5d8c7e971c684aa726faa20dbf415d3a742d5
parentf673b7c2c5c79ec239aca504452d2584b0bad34a
parentb728a5c806fb36f9adebf2a862bbd015e074afca
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