diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:18:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:18:39 -0400 |
| commit | f48d1915b86f06a943087e5f9b29542a1ef4cd4d (patch) | |
| tree | 86b5d8c7e971c684aa726faa20dbf415d3a742d5 /block/blk-timeout.c | |
| parent | f673b7c2c5c79ec239aca504452d2584b0bad34a (diff) | |
| parent | b728a5c806fb36f9adebf2a862bbd015e074afca (diff) | |
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions