summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-07-16 20:10:35 +0400
committerJiri Kosina <jkosina@suse.cz>2011-07-22 18:47:15 +0400
commitdf2e301fee3c2c2a87592151397ad7699bb14c37 (patch)
tree09364e1443d8cac6c415af5e8d07b2b37793b68e /net
parent497888cf69bf607ac1fe061a6437e0a670b0022f (diff)
downloadlinux-df2e301fee3c2c2a87592151397ad7699bb14c37.tar.xz
fs: Merge split strings
No idea why these were split in the first place... Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions