diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 19:51:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 19:51:45 -0800 |
commit | 0aa2ca9ae1e08d11661abb00ae6e75ff885448d6 (patch) | |
tree | a770d55fd53b2658501672b5c0893cc1d91d5a07 /kernel | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | reiserfs: Fix softlockup while waiting on an inode (diff) | |
download | linux-dev-0aa2ca9ae1e08d11661abb00ae6e75ff885448d6.tar.xz linux-dev-0aa2ca9ae1e08d11661abb00ae6e75ff885448d6.zip |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions