diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 18:55:53 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 18:55:53 +0200 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /drivers/net/gianfar_mii.h | |
| parent | [MTD ONENAND] Check OneNAND lock scheme & all block unlock command support (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff) | |
| download | linux-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.xz linux-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/gianfar_mii.h')
| -rw-r--r-- | drivers/net/gianfar_mii.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h index d527cf2f9c1d..5d3400469514 100644 --- a/drivers/net/gianfar_mii.h +++ b/drivers/net/gianfar_mii.h @@ -1,4 +1,4 @@ -/* +/* * drivers/net/gianfar_mii.h * * Gianfar Ethernet Driver -- MII Management Bus Implementation |