diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-17 10:43:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-17 10:43:19 -0700 |
commit | a08797e853e27fedb2468d4fd45459fd62902143 (patch) | |
tree | d6b2aa197ded9d9c4e81ef115540f5c76f1feb25 /drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | |
parent | 215b28a5308f3d332df2ee09ef11fda45d7e4a92 (diff) | |
parent | a361293f5fedea0016a10599f409631a15d47ee7 (diff) | |
download | linux-stable-a08797e853e27fedb2468d4fd45459fd62902143.tar.gz linux-stable-a08797e853e27fedb2468d4fd45459fd62902143.tar.bz2 linux-stable-a08797e853e27fedb2468d4fd45459fd62902143.zip |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull jbd2 bug fixes from Ted Ts'o:
"Two jbd2 bug fixes, one of which is a regression fix"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: Fix oops in jbd2_journal_file_inode()
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.h')
0 files changed, 0 insertions, 0 deletions