diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
| commit | b3ce1debe2685383a9ad6ace9c49869c3968c013 (patch) | |
| tree | dcb606fac467d6ce78a9c608a1e0d2323af44f2b /include/linux/mtd/ftl.h | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
| parent | c2965f1129ee54afcc4ef293ff0f25fa3a7e7392 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Some manual fixups for clashing kfree() cleanups etc.
Diffstat (limited to 'include/linux/mtd/ftl.h')
| -rw-r--r-- | include/linux/mtd/ftl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mtd/ftl.h b/include/linux/mtd/ftl.h index 3678459b4535..d99609113307 100644 --- a/include/linux/mtd/ftl.h +++ b/include/linux/mtd/ftl.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: ftl.h,v 1.6 2003/01/24 13:20:04 dwmw2 Exp $ | 2 | * $Id: ftl.h,v 1.7 2005/11/07 11:14:54 gleixner Exp $ |
| 3 | * | 3 | * |
| 4 | * Derived from (and probably identical to): | 4 | * Derived from (and probably identical to): |
| 5 | * ftl.h 1.7 1999/10/25 20:23:17 | 5 | * ftl.h 1.7 1999/10/25 20:23:17 |
| 6 | * | 6 | * |
| @@ -12,7 +12,7 @@ | |||
| 12 | * Software distributed under the License is distributed on an "AS IS" | 12 | * Software distributed under the License is distributed on an "AS IS" |
| 13 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See | 13 | * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See |
| 14 | * the License for the specific language governing rights and | 14 | * the License for the specific language governing rights and |
| 15 | * limitations under the License. | 15 | * limitations under the License. |
| 16 | * | 16 | * |
| 17 | * The initial developer of the original code is David A. Hinds | 17 | * The initial developer of the original code is David A. Hinds |
| 18 | * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds | 18 | * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds |