summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-12-10 15:06:14 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-10 15:06:14 -0500
commit7d339890e79fd9a0508f2781e318b57dfb44b810 (patch)
tree40e8019d044e0f81f15ed76ba25224c38d38fb48 /fs/nfsd
parent340b6e59fbc6ac97469253315c96e952908c9c0d (diff)
parent330078abd823cf644444999e7812a8884fce7b8e (diff)
downloadlinux-7d339890e79fd9a0508f2781e318b57dfb44b810.tar.bz2
Merge branch 'isdn-next'
Tilman Schmidt says: ==================== ISDN patches for net-next Here's a series of patches for the Gigaset ISDN driver and one for the ISDN CAPI subsystem. Please merge as appropriate. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions