David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
Kconfig	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
Makefile	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
b43.h	b43: support bcma core reset on AC-PHY hardware	2015-01-29 10:54:43 +02:00
bus.c	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
bus.h	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
debugfs.c	…
debugfs.h	b43: return true / false instead of numbers in functions which return bool value	2014-02-24 15:21:54 -05:00
dma.c	DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper	2013-09-21 21:02:22 +01:00
dma.h	B43: Handle DMA RX descriptor underrun	2013-05-08 17:15:06 -04:00
leds.c	…
leds.h	…
lo.c	…
lo.h	…
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
main.h	b43: Implement PHY PLL reset	2014-09-15 15:00:53 -04:00
pcmcia.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07:00
pcmcia.h	…
phy_a.c	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
phy_a.h	b43: remove leftover code from old devices support	2014-06-20 14:13:45 -04:00
phy_ac.c	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
phy_ac.h	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
phy_common.c	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
phy_common.h	b43: AC-PHY: prepare place for developing new PHY support	2015-01-29 10:54:43 +02:00
phy_g.c	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
phy_g.h	…
phy_ht.c	b43: Implement PHY PLL reset	2014-09-15 15:00:53 -04:00
phy_ht.h	b43: HT-PHY: Implement band switching	2014-09-15 15:00:50 -04:00
phy_lcn.c	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
phy_lcn.h	…
phy_lp.c	b43: flush some writes on Broadcom MIPS SoCs	2014-08-25 16:00:42 -04:00
phy_lp.h	…
phy_n.c	b43: Implement PHY PLL reset	2014-09-15 15:00:53 -04:00
phy_n.h	b43: N-PHY: support setting custom TX power	2014-08-25 16:00:43 -04:00
pio.c	b43: return true / false instead of numbers in functions which return bool value	2014-02-24 15:21:54 -05:00
pio.h	…
ppr.c	b43: implement PPR (Power Per Rate) management/API	2014-08-25 16:00:43 -04:00
ppr.h	b43: implement PPR (Power Per Rate) management/API	2014-08-25 16:00:43 -04:00
radio_2055.c	…
radio_2055.h	…
radio_2056.c	b43: N-PHY: add missing calib values for radio 0x2026 rev 11	2014-05-22 14:04:37 -04:00
radio_2056.h	…
radio_2057.c	b43: N-PHY: add tables for radio 0x2057 rev 14	2014-07-18 13:45:25 -04:00
radio_2057.h	b43; N-PHY: write most of the missing code for revs 7+	2014-07-15 15:51:39 -04:00
radio_2059.c	b43: HT-PHY: Update values for frequency calibration	2014-09-15 15:00:50 -04:00
radio_2059.h	b43: HT-PHY: Complete radio init (add missing entries)	2014-09-11 15:27:35 -04:00
rfkill.c	…
rfkill.h	…
sdio.c	b43: remove __dev* attributes	2012-12-06 15:04:56 -05:00
sdio.h	b43: mark some functions and structs static	2013-04-01 16:06:50 -04:00
sysfs.c	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
sysfs.h	…
tables.c	…
tables.h	…
tables_lpphy.c	…
tables_lpphy.h	…
tables_nphy.c	b43: N-PHY: add RF power tables for radio 0x2057 revs 9 & 14	2014-08-25 16:00:43 -04:00
tables_nphy.h	b43: N-PHY: add RF power tables for radio 0x2057 revs 9 & 14	2014-08-25 16:00:43 -04:00
tables_phy_ht.c	…
tables_phy_ht.h	…
tables_phy_lcn.c	b43: mark some functions and structs static	2013-04-01 16:06:50 -04:00
tables_phy_lcn.h	…
wa.c	b43: G-PHY: fix random mistakes to match specs	2014-04-22 15:06:32 -04:00
wa.h	…
xmit.c	b43: report correct rate to mac80211 for 5 GHz packets	2014-07-23 13:08:35 -04:00
xmit.h	b43: update some transmit header constants	2014-09-15 15:00:54 -04:00