Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 02:03:02 +0000 (18:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 02:03:02 +0000 (18:03 -0800)
commit6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd
tree5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685
parent5ee354a0295c34aa7da07be8490f86edee2c7883
parent2174f6df7891fa331800beb72634c969f017900b
Merge branch 'pstore' of git://git./linux/kernel/git/aegl/linux

* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: gracefully handle NULL pstore_info functions
  pstore: pass reason to backend write callback
drivers/firmware/efivars.c