David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-09-05 14:58:52 -04:00
..
android	staging: android: logger: Correct write offset reset on error	2013-07-23 15:08:50 -07:00
asus_oled	staging/asus_oled fixed linebreak and printk issue	2013-06-05 15:29:07 -07:00
bcm	Staging: bcm: fix checkpatch errors and warnings in Version.h	2013-05-21 19:59:50 -07:00
btmtk_usb	staging: btmtk_usb: use GFP_KERNEL inplace of GFP_ATOMIC in _probe path	2013-06-03 12:35:53 -07:00
ced1401	Staging: ced1401: Staticize local symbols	2013-05-22 15:31:39 -07:00
comedi	staging: comedi: bug-fix NULL pointer dereference on failed attach	2013-08-23 10:31:47 -07:00
cptm1217
crystalhd	Staging: crystalhd: remove an unneeded NULL check	2013-06-03 12:26:18 -07:00
cxt1e1	Staging/cxt1e1:Removing parantheses surrounding return argument	2013-05-22 15:28:30 -07:00
dgrp	drivers: avoid format string in dev_set_name	2013-07-03 16:07:41 -07:00
dwc2	staging: dwc2: fix thinko in dwc2_hc_set_even_odd_frame()	2013-06-24 15:56:10 -07:00
echo
et131x
frontier	staging: frontier: use after free in disconnect()	2013-07-23 15:08:50 -07:00
ft1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
fwserial	IEEE 1394 (FireWire) subsystem changes post v3.10:	2013-07-10 11:02:58 -07:00
gdm72xx	staging: gdm72xx: potential use after free in send_qos_list()	2013-07-23 15:08:50 -07:00
goldfish
iio	iio staging: fix lis3l02dq, read error handling	2013-07-09 22:11:53 +01:00
imx-drm	staging: drm/imx: drop "select OF_VIDEOMODE"	2013-07-23 15:08:50 -07:00
keucr	staging: keucr: removed unnecessary variables and comments	2013-06-17 14:46:18 -07:00
line6	staging: line6: Fix unlocked snd_pcm_stop() call	2013-07-15 21:25:14 +02:00
lustre	mode_t whack-a-mole...	2013-07-06 23:04:23 +04:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-07-13 12:09:57 -07:00
netlogic	staging: netlogic: Fix typo in staging/netlogic	2013-06-24 15:56:09 -07:00
nvec	staging: nvec: move device tree parsing to its own function	2013-06-24 15:59:03 -07:00
octeon	MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC	2013-06-10 18:01:25 +02:00
octeon-usb	staging: octeon-usb: octeon-hcd: eliminate printk()s	2013-06-18 11:17:04 -07:00
olpc_dcon
ozwpan	staging: ozwpan: remove event tracing code.	2013-06-17 14:48:12 -07:00
panel
phison
quickstart
rtl8187se	Update e-mail address for Andrea Merello (resubmit)	2013-08-26 14:10:40 -04:00
rtl8192e	Update e-mail address for Andrea Merello (resubmit)	2013-08-26 14:10:40 -04:00
rtl8192u	Update e-mail address for Andrea Merello (resubmit)	2013-08-26 14:10:40 -04:00
rtl8712	drivers: avoid parsing names as kthread_run() format strings	2013-07-03 16:07:41 -07:00
rts5139	staging: rts5139: Use correct USB transfer interval to fix syslog spamming	2013-06-03 12:15:34 -07:00
sb105x
sbe-2t3e3
sep
serqt_usb2	Staging tree merge for 3.11-rc1	2013-07-02 11:40:23 -07:00
silicom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
slicoss
sm7xxfb
speakup	staging: speakup: fix warnings by adding __user annotations	2013-05-22 15:35:52 -07:00
ste_rmi4
tidspbridge	staging: tidspbridge: replace strict_strtol() with kstrtos32()	2013-07-24 09:51:18 -07:00
usbip
vme
vt6655	staging: vt6655: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:50 -04:00
vt6656	staging: vt6656: mac.c MACvDisableKeyEntry remove dead code wOffset	2013-06-17 14:55:32 -07:00
winbond	Staging: winbond: Check for unsuccessful allocation immediately	2013-06-03 12:32:00 -07:00
wlags49_h2
wlags49_h25
wlan-ng
xgifb	staging: xgifb: vb_setmode: delete IF_DEF_CRT2Monitor checks	2013-05-30 20:55:53 +09:00
zcache	staging: zcache: fix "zcache=" kernel parameter	2013-07-29 11:45:09 -07:00
zram	staging: zram: protect zram_reset_device() call	2013-07-23 15:08:50 -07:00
zsmalloc
Kconfig	staging: csr: remove driver	2013-07-16 22:37:09 -07:00
Makefile	staging: csr: remove driver	2013-07-16 22:37:09 -07:00
staging.c