| commit | 0aa2ca9ae1e08d11661abb00ae6e75ff885448d6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:51:45 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:51:45 2010 -0800 |
| tree | a770d55fd53b2658501672b5c0893cc1d91d5a07 | |
| parent | 76212a840f6edc2b89865f09464f3bd90125896d [diff] | |
| parent | 175359f89df39f4faed663c8cfd6ee0222d2fa1e [diff] |
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: reiserfs: Fix softlockup while waiting on an inode