Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller
2012-04-10 14:30:45 -04:00
當前提交 06eb4eafbd
共有 4047 個文件被更改,包括 104278 次插入50193 次删除

查看文件

@@ -46,7 +46,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <asm/system.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/delay.h>

查看文件

@@ -122,7 +122,6 @@ static const char version[] =
#include <linux/skbuff.h>
#include <asm/io.h>
#include <asm/system.h>
/* Constant definitions for the DE-620 registers, commands and bits */
#include "de620.h"