summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-16 15:02:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-16 15:02:57 -0700
commit9c1be0c4712fe760d8969427ef91107e9c062d91 (patch)
tree01210aba49c120116bb99ba031ff86a525ffb63d /fs/proc
parent42fdd144a40f3afaccaa7ea538268bad3596439e (diff)
parent0d7eff873caaeac84de01a1acdca983d2c7ba3fe (diff)
downloadlinux-3.10-9c1be0c4712fe760d8969427ef91107e9c062d91.tar.gz
linux-3.10-9c1be0c4712fe760d8969427ef91107e9c062d91.tar.bz2
linux-3.10-9c1be0c4712fe760d8969427ef91107e9c062d91.zip
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6: UBIFS: include to compilation UBIFS: add new flash file system UBIFS: add brief documentation MAINTAINERS: add UBIFS section do_mounts: allow UBI root device name VFS: export sync_sb_inodes VFS: move inode_lock into sync_sb_inodes
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions