linux-sg2042/include/linux/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
..
ssb.h ssb: define more board types 2013-03-25 16:43:40 -04:00
ssb_driver_chipcommon.h ssb: implement spurious tone avoidance 2013-04-10 10:31:26 -04:00
ssb_driver_extif.h Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
ssb_driver_gige.h ssb: get mac address from sprom struct for gige driver 2013-02-07 23:47:01 -05:00
ssb_driver_mips.h ssb: add gpio_to_irq 2013-01-30 15:07:06 -05:00
ssb_driver_pci.h
ssb_embedded.h
ssb_regs.h ssb: fix sprom constant for ant_available_{bg,a} 2013-03-25 16:43:41 -04:00