summaryrefslogtreecommitdiff
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 13:14:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 13:14:25 -0800
commitf8e9766dd1bacd5f32f9ac4322b55fbfd46b778e (patch)
treef6b5ff90350cf7f8d803c3b25d4b2b174b3e17f0 /fs/nilfs2
parentd661d76b0262f3ed649a1dea24c0119757592b09 (diff)
parent00afa758067ac1c947149ef766adcdfe30c44d7d (diff)
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLAB: Fix lockdep annotation breakage
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions