linux/drivers/ssb
David S. Miller 6e0895c2ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	drivers/net/ethernet/intel/igb/igb_main.c
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	include/net/scm.h
	net/batman-adv/routing.c
	net/ipv4/tcp_input.c

The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.

The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.

An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.

Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.

Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.

Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-22 20:32:51 -04:00
..
b43_pci_bridge.c ssb: add PCI ID 0x4350 2012-10-29 15:30:36 -04:00
driver_chipcommon_pmu.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-22 20:32:51 -04:00
driver_chipcommon_sflash.c ssb: add database of serial flash memories 2013-01-11 14:49:58 -05:00
driver_chipcommon.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
driver_extif.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
driver_gige.c Drivers: ssb: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
driver_gpio.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-08 18:02:14 -05:00
driver_mipscore.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
driver_pcicore.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
embedded.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
Kconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-01-28 13:54:03 -05:00
main.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
Makefile ssb: add place for serial flash driver 2013-01-09 14:37:09 -05:00
pci.c ssb: read additional sprom v2 and v3 attributes. 2013-03-25 16:46:56 -04:00
pcihost_wrapper.c Drivers: ssb: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
pcmcia.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
scan.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
sdio.c ssb: remove 5GHz antenna gain from sprom 2012-03-05 15:20:49 -05:00
sprom.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
ssb_private.h ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00