Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity
android_kernel_samsung_msm8976/drivers/net/caif
History
David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-04-30 03:55:20 -04:00
..
Kconfig caif: remove caif_shm 2013-03-17 12:16:38 -04:00
Makefile caif: remove caif_shm 2013-03-17 12:16:38 -04:00
caif_hsi.c caif: Update Dmitry's email address. 2013-04-23 13:25:51 -04:00
caif_serial.c caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
caif_spi.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
caif_spi_slave.c caif: Remove bouncing address for Daniel Martensson 2013-04-23 13:25:51 -04:00