diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 10:17:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 10:17:15 +0200 |
| commit | 28638ea4f8adb63f837e4436560ab16ab0388587 (patch) | |
| tree | 2dab7a03d7696697c82ba62a03700d3a2f3639b1 /drivers/atm/he.h | |
| parent | f781b03c4b1c713ac000877c8bbc31fc4164a29b (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
| download | talos-op-linux-28638ea4f8adb63f837e4436560ab16ab0388587.tar.gz talos-op-linux-28638ea4f8adb63f837e4436560ab16ab0388587.zip | |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
Diffstat (limited to 'drivers/atm/he.h')
| -rw-r--r-- | drivers/atm/he.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/atm/he.h b/drivers/atm/he.h index 1dc277547a73..fe6cd15a78a4 100644 --- a/drivers/atm/he.h +++ b/drivers/atm/he.h @@ -1,5 +1,3 @@ -/* $Id: he.h,v 1.4 2003/05/06 22:48:00 chas Exp $ */ - /* he.h |
