aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 16:06:44 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 16:06:44 -0500
commit9cefa17e196beab300d4faf09d242de77e5900d5 (patch)
treec7f8e6677e0370466fdc8fca1a7bc87a7902151b /fs/nfsd
parent891cc2283216bf76f387546f0e220caf8ce9fbf9 (diff)
parent6ce1f81f51c7b22f539012e446c01e8c75d20fd9 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix ia64 build failure in pmdp_get_and_clear
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions