diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 23:53:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 23:53:53 +0200 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /arch/m68k/mac | |
| parent | xfrm: Fix crashes in xfrm_lookup() (diff) | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| download | linux-871039f02f8ec4ab2e5e9010718caa8e085786f1.tar.xz linux-871039f02f8ec4ab2e5e9010718caa8e085786f1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'arch/m68k/mac')
| -rw-r--r-- | arch/m68k/mac/misc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 5d818568b343..0f118ca156d9 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -8,7 +8,6 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/time.h> #include <linux/rtc.h> #include <linux/mm.h> |