summaryrefslogtreecommitdiff
path: root/include/linux/nfs_fs_i.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 23:15:55 +0400
committerArnd Bergmann <arnd@arndb.de>2012-03-24 23:16:04 +0400
commit7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch)
tree14af84e9a635e59293edf81aa562b6740c57d310 /include/linux/nfs_fs_i.h
parentf4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (diff)
parentc899445f9783309ac73073282d4c0ae27f51fa9a (diff)
downloadlinux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.xz
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons a rebuild of the tree missed it, so I'm putting it back in now. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/nfs_fs_i.h')
0 files changed, 0 insertions, 0 deletions