David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
android	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-17 15:44:47 -08:00
asus_oled	Staging: asus_oled: Add suspend/resume callbacks	2012-09-04 13:12:13 -07:00
bcm	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
ccg	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
ced1401	staging: ced1401: Fix typo in staging/ced1401	2012-11-26 16:21:58 -08:00
comedi	staging: comedi: comedi_test: fix race when cancelling command	2013-01-07 14:48:25 -08:00
cptm1217	staging: cptm1217: use module_i2c_driver macro	2012-09-04 14:23:33 -07:00
crystalhd	staging: crystalhd: remove use of __devexit	2012-11-21 15:05:12 -08:00
csr	staging: csr: remove CONFIG_HOTPLUG ifdefs	2012-11-21 15:04:58 -08:00
cxt1e1	staging: cxt1e1: sbecrc.c: fixes coding style issue	2012-11-21 14:21:48 -08:00
dgrp	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
echo	…
et131x	net: phy: remove flags argument from phy_{attach, connect, connect_direct}	2013-01-14 15:11:50 -05:00
frontier	…
ft1000	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
fwserial	staging/fwserial: Update TODO file per reviewer comments	2013-01-07 11:16:49 -08:00
gdm72xx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-12 12:22:13 -08:00
iio	staging:iio:adis16260: Select adislib	2012-12-27 10:59:31 +00:00
imx-drm	staging: drm/imx: fix double free bug in error path	2013-01-07 12:27:52 -08:00
keucr	USB merge for 3.7-rc1	2012-10-01 13:23:01 -07:00
line6	staging: line6: drop unused dumprequest code	2012-11-26 16:13:51 -08:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-12-13 19:22:22 -08:00
net	staging: net: remove use of __devexit	2012-11-21 15:05:02 -08:00
nvec	ARM: arm-soc: Cleanups on various subarchitectures	2012-12-12 11:51:39 -08:00
octeon	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
olpc_dcon	staging: olpc_dcon: remove use of __devexit_p	2012-11-21 15:05:00 -08:00
omap-thermal	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2012-12-12 07:57:13 -08:00
omapdrm	Staging fixes for 3.8-rc3	2013-01-14 09:08:38 -08:00
ozwpan	staging: ozwpan: Remove redundant null check before kfree in ozhcd.c	2012-11-21 13:50:12 -08:00
panel	staging: panel: pass correct lengths to keypad_send_key()	2012-11-29 18:16:15 -08:00
phison	…
quickstart	…
ramster	staging: ramster: depends on NET	2012-10-22 15:42:38 -07:00
rtl8187se	staging: rtl8187se: Fix failure to check pci_map_single()	2013-01-07 12:57:27 -08:00
rtl8192e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
rtl8192u	staging: rtl8192u: remove use of __devexit	2012-11-21 14:07:43 -08:00
rtl8712	staging: r8712u: Add new device ID	2013-01-07 09:50:40 -08:00
rts5139	staging: rts5139: fixed issues when config to built-in object	2012-10-22 15:58:22 -07:00
sb105x	staging: Enable parport sb105x drivers if parport is configured	2013-01-07 09:32:46 -08:00
sbe-2t3e3	staging: sbe-2t3e3: remove use of __devexit	2012-11-21 15:05:10 -08:00
sep	staging: sep: remove use of __devinit	2012-11-21 15:05:01 -08:00
serqt_usb2	staging/serqt_usb2: Refactor qt_status_change_check() in serqt_usb2.c	2012-11-16 15:03:10 -08:00
silicom	Staging: silicom: bypasslib: remove unused including <linux/version.h>	2012-11-01 08:44:42 -07:00
slicoss	staging: slicoss: remove use of __devexit	2012-11-21 15:05:11 -08:00
sm7xxfb	staging: sm7xxfb: remove use of __devexit	2012-11-21 15:05:12 -08:00
speakup	staging: speakup: avoid out-of-range access in synth_add()	2013-01-07 13:53:28 -08:00
ste_rmi4	staging: ste_rmi4: remove use of __devexit	2012-11-21 15:05:12 -08:00
tidspbridge	staging: tidspbridge: use prepare/unprepare on dsp clocks	2013-01-07 15:03:56 -08:00
usbip	staging: usbip: remove use of __devexit_p	2012-11-21 15:04:59 -08:00
vme	staging: vme_pio2: fix oops on module unloading	2013-01-07 13:56:24 -08:00
vt6655	staging: vt6655: remove use of __devexit	2012-11-21 15:05:12 -08:00
vt6656	staging: vt6656: wpa_set_keys remove fcpfkernel	2012-11-26 16:24:16 -08:00
winbond	Staging: winbond: wb35rx_s: Fixed coding style issue	2012-11-13 13:11:57 -08:00
wlags49_h2	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
wlags49_h25	staging: "wlags49_h25" Fix typos.	2012-09-17 14:50:33 -07:00
wlan-ng	Staging: wlan-ng: Add missing argument	2013-01-07 09:50:40 -08:00
xgifb	staging: xgifb: remove use of __devexit	2012-11-21 15:05:12 -08:00
zcache	Merge 3.6-rc6 into staging-next	2012-09-16 17:17:25 -07:00
zram	staging: zram: fix invalid memory references during disk write	2013-01-13 19:40:02 -08:00
zsmalloc	…
Kconfig	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
Makefile	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08:00
staging.c	…