summaryrefslogtreecommitdiff
path: root/include/linux/mtd/concat.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-28 15:26:12 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-10-28 15:26:12 (GMT)
commit7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch)
treee730a4565e0318140d2fbd2f0415d18a339d7336 /include/linux/mtd/concat.h
parent41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
downloadlinux-fsl-qoriq-7a9787e1eba95a166265e6a260cf30af04ef0a99.tar.xz
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'include/linux/mtd/concat.h')
-rw-r--r--include/linux/mtd/concat.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h
index ed8dc67..c02f3d2 100644
--- a/include/linux/mtd/concat.h
+++ b/include/linux/mtd/concat.h
@@ -4,8 +4,6 @@
* (C) 2002 Robert Kaiser <rkaiser@sysgo.de>
*
* This code is GPL
- *
- * $Id: concat.h,v 1.1 2002/03/08 16:34:36 rkaiser Exp $
*/
#ifndef MTD_CONCAT_H