aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:14:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:14:29 -0700
commite4d50423d773fb8d5b714430ba5358e8a1b87c14 (patch)
treefc6f6bd830cb8b2a1a94734c35b18d0f2ac7ea8c /arch
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 (diff)
parentnilfs2: fix imperfect completion wait in nilfs_wait_on_logs (diff)
downloadlinux-dev-e4d50423d773fb8d5b714430ba5358e8a1b87c14.tar.xz
linux-dev-e4d50423d773fb8d5b714430ba5358e8a1b87c14.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix imperfect completion wait in nilfs_wait_on_logs nilfs2: fix hang-up of cleaner after log writer returned with error nilfs2: fix duplicate call to nilfs_segctor_cancel_freev
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions