OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
ba59814b39
linux/drivers/staging
History
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
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
comedi staging: comedi: comedi_test: fix race when cancelling command 2013-01-07 14:48:25 -08:00
cptm1217
crystalhd
csr
cxt1e1
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
line6
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
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
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
panel staging: panel: pass correct lengths to keypad_send_key() 2012-11-29 18:16:15 -08:00
phison
quickstart
ramster
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
rtl8712 staging: r8712u: Add new device ID 2013-01-07 09:50:40 -08:00
rts5139
sb105x staging: Enable parport sb105x drivers if parport is configured 2013-01-07 09:32:46 -08:00
sbe-2t3e3
sep
serqt_usb2
silicom
slicoss
sm7xxfb
speakup staging: speakup: avoid out-of-range access in synth_add() 2013-01-07 13:53:28 -08:00
ste_rmi4
tidspbridge staging: tidspbridge: use prepare/unprepare on dsp clocks 2013-01-07 15:03:56 -08:00
usbip
vme staging: vme_pio2: fix oops on module unloading 2013-01-07 13:56:24 -08:00
vt6655
vt6656
winbond
wlags49_h2 ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08:00
wlags49_h25
wlan-ng Staging: wlan-ng: Add missing argument 2013-01-07 09:50:40 -08:00
xgifb
zcache
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