diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /include/linux | |
parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/udf_fs.h | 5 | ||||
-rw-r--r-- | include/linux/udf_fs_i.h | 5 | ||||
-rw-r--r-- | include/linux/udf_fs_sb.h | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/udf_fs.h b/include/linux/udf_fs.h index 46e2bb945353..36c684e1b110 100644 --- a/include/linux/udf_fs.h +++ b/include/linux/udf_fs.h | |||
@@ -13,11 +13,6 @@ | |||
13 | * http://www.osta.org/ * http://www.ecma.ch/ | 13 | * http://www.osta.org/ * http://www.ecma.ch/ |
14 | * http://www.iso.org/ | 14 | * http://www.iso.org/ |
15 | * | 15 | * |
16 | * CONTACTS | ||
17 | * E-mail regarding any portion of the Linux UDF file system should be | ||
18 | * directed to the development team mailing list (run by majordomo): | ||
19 | * linux_udf@hpesjro.fc.hp.com | ||
20 | * | ||
21 | * COPYRIGHT | 16 | * COPYRIGHT |
22 | * This file is distributed under the terms of the GNU General Public | 17 | * This file is distributed under the terms of the GNU General Public |
23 | * License (GPL). Copies of the GPL can be obtained from: | 18 | * License (GPL). Copies of the GPL can be obtained from: |
diff --git a/include/linux/udf_fs_i.h b/include/linux/udf_fs_i.h index 62b15a4214e6..1e7508420fcf 100644 --- a/include/linux/udf_fs_i.h +++ b/include/linux/udf_fs_i.h | |||
@@ -3,11 +3,6 @@ | |||
3 | * | 3 | * |
4 | * This file is intended for the Linux kernel/module. | 4 | * This file is intended for the Linux kernel/module. |
5 | * | 5 | * |
6 | * CONTACTS | ||
7 | * E-mail regarding any portion of the Linux UDF file system should be | ||
8 | * directed to the development team mailing list (run by majordomo): | ||
9 | * linux_udf@hpesjro.fc.hp.com | ||
10 | * | ||
11 | * COPYRIGHT | 6 | * COPYRIGHT |
12 | * This file is distributed under the terms of the GNU General Public | 7 | * This file is distributed under the terms of the GNU General Public |
13 | * License (GPL). Copies of the GPL can be obtained from: | 8 | * License (GPL). Copies of the GPL can be obtained from: |
diff --git a/include/linux/udf_fs_sb.h b/include/linux/udf_fs_sb.h index 1966a6dbb4b6..b15ff2e99c91 100644 --- a/include/linux/udf_fs_sb.h +++ b/include/linux/udf_fs_sb.h | |||
@@ -3,11 +3,6 @@ | |||
3 | * | 3 | * |
4 | * This include file is for the Linux kernel/module. | 4 | * This include file is for the Linux kernel/module. |
5 | * | 5 | * |
6 | * CONTACTS | ||
7 | * E-mail regarding any portion of the Linux UDF file system should be | ||
8 | * directed to the development team mailing list (run by majordomo): | ||
9 | * linux_udf@hpesjro.fc.hp.com | ||
10 | * | ||
11 | * COPYRIGHT | 6 | * COPYRIGHT |
12 | * This file is distributed under the terms of the GNU General Public | 7 | * This file is distributed under the terms of the GNU General Public |
13 | * License (GPL). Copies of the GPL can be obtained from: | 8 | * License (GPL). Copies of the GPL can be obtained from: |