A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
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
This commit is contained in:
David S. Miller 2010-04-11 14:53:53 -07:00
commit 871039f02f
4645 changed files with 13577 additions and 6319 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/ssb/driver_gige.c
View file

@ -12,6 +12,7 @@
#include <linux/ssb/ssb_driver_gige.h>
#include <linux/pci.h>
#include <linux/pci_regs.h>
#include <linux/slab.h>
/*

1
drivers/ssb/main.c
View file

@ -18,6 +18,7 @@
#include <linux/dma-mapping.h>
#include <linux/pci.h>
#include <linux/mmc/sdio_func.h>
#include <linux/slab.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>

1
drivers/ssb/pci.c
View file

@ -17,6 +17,7 @@
#include <linux/ssb/ssb.h>
#include <linux/ssb/ssb_regs.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/delay.h>

1
drivers/ssb/pcihost_wrapper.c
View file

@ -12,6 +12,7 @@
*/
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/ssb/ssb.h>

1
drivers/ssb/sprom.c
View file

@ -14,6 +14,7 @@
#include "ssb_private.h"
#include <linux/ctype.h>
#include <linux/slab.h>
static const struct ssb_sprom *fallback_sprom;