summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-02 19:48:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-02 19:48:54 -0700
commit0afa80ab6ff9aac57f118463699cee306ad6ed8a (patch)
treec5002a93cf59827fb5f8506ff91a77cb826d90ae /init/main.c
parent5193d7a7f500cfbbfc0de221e808208199723521 (diff)
parentb7b7fa43103a9fb30dbcc60cbd5161fdfc25f904 (diff)
downloadop-kernel-dev-0afa80ab6ff9aac57f118463699cee306ad6ed8a.zip
op-kernel-dev-0afa80ab6ff9aac57f118463699cee306ad6ed8a.tar.gz
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 locking BUG during mount failure
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud