David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
android	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-04-02 16:23:38 -07:00
bcm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-04-02 16:23:38 -07:00
ced1401
comedi	staging: comedi: usbdux: bug fix for accessing 'ao_chanlist' in private data	2014-04-23 16:20:15 -07:00
cptm1217
crystalhd
cxt1e1
dgap	staging: dgap: fix the rest of the checkpatch warnings in dgap.c	2014-03-19 13:54:39 -07:00
dgnc
dgrp
et131x	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
frontier	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-04-02 16:23:38 -07:00
ft1000	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
fwserial
gdm72xx
gdm724x
goldfish	staging: goldfish: Call free_irq in error path	2014-04-16 11:41:44 -07:00
gs_fpgaboot	staging: gs_fpgaboot: remove __TIMESTAMP__ macro	2014-04-15 14:46:43 -07:00
iio	staging:iio:ad2s1200 fix missing parenthesis in a for statment.	2014-04-26 10:51:14 +01:00
imx-drm	imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'	2014-04-26 11:23:38 +01:00
keucr
line6	Staging driver pull request for 3.15-rc1	2014-04-01 16:45:00 -07:00
lustre	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-04-12 17:31:22 -07:00
media	[media] Prefer gspca_sonixb over sn9c102 for all devices	2014-04-15 09:59:31 -03:00
mt29f_spinand
netlogic	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
nokia_h4p	staging: nokia_h4p: Fix quoted string split across lines	2014-03-19 13:50:23 -07:00
nvec
octeon	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
octeon-usb	staging: octeon-usb: prevent memory corruption	2014-03-20 01:51:12 +00:00
olpc_dcon
ozwpan
panel
phison
quickstart
rtl8188eu	staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0	2014-04-16 13:07:19 -07:00
rtl8192e	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-04-02 16:23:38 -07:00
rtl8192u	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-04-02 16:23:38 -07:00
rtl8712	staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0	2014-04-16 13:07:19 -07:00
rtl8723au	staging: rtl8723au: Do not reset wdev->iftype in netdev_close()	2014-05-16 15:23:11 -07:00
rtl8821ae	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-05-02 13:47:50 -04:00
rts5139
rts5208
sbe-2t3e3
sep
serqt_usb2
silicom
slicoss
speakup	staging: speakup: fix misuse of kstrtol() in handle_goto()	2014-04-16 11:41:44 -07:00
ste_rmi4
tidspbridge
unisys	Staging: unisys: use after free in list_for_each()	2014-04-16 11:41:45 -07:00
usbip	staging/usbip: fix store_attach() sscanf return value check	2014-04-15 14:43:01 -07:00
vme	staging: vme: fix memory leak in vme_user_probe()	2014-04-15 14:46:43 -07:00
vt6655
vt6656
winbond
wlags49_h2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-04-02 20:53:45 -07:00
wlags49_h25
wlan-ng
xgifb	video: move fbdev to drivers/video/fbdev	2014-04-17 08:10:19 +03:00
xillybus	staging: xillybus: XILLYBUS_PCIE depends on PCI_MSI	2014-03-21 12:24:09 -07:00
Kconfig	staging: delete rtl8187se wireless driver	2014-04-16 11:35:54 -07:00
Makefile	staging: delete rtl8187se wireless driver	2014-04-16 11:35:54 -07:00
staging.c