FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-14 21:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers/staging
History
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
altera-stapl
Altera-stapl: Clean up makefile (-y instead of -objs)
2011-07-08 14:03:38 -07:00
asus_oled
…
bcm
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-07-25 23:26:34 -07:00
brcm80211
Merge branch 'master' of github.com:davem330/net
2011-09-22 03:23:13 -04:00
comedi
staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled
2011-09-19 17:15:46 -07:00
cptm1217
…
crystalhd
…
cx25821
…
cxd2099
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-30 00:08:53 -07:00
cxt1e1
Remove unneeded version.h include from drivers/staging/cxt1e1/sbecom_inline_linux.h
2011-07-05 10:39:39 -07:00
dt3155v4l
drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h
2011-08-02 16:09:47 -07:00
easycap
staging/easycap: remove oss support
2011-07-08 14:02:26 -07:00
echo
drivers: staging: echo: Fix coding style issues.
2011-07-05 20:37:37 -07:00
et131x
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
frontier
…
ft1000
staging: ft1000_proc needs asm/io.h for inw/outw on sparc
2011-08-02 16:07:51 -07:00
gma500
gma500: kill MIPI interface types
2011-08-16 07:22:16 -07:00
go7007
…
hv
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-08-20 10:39:12 -07:00
iio
Staging: iio: add some unlocks to raw_read() functions
2011-08-02 16:07:51 -07:00
intel_sst
sst: avoid unnecessary firmware reloading for MRST
2011-07-08 14:02:25 -07:00
keucr
Staging: Remove ENE UB6250 MS card codes from keucr
2011-07-08 14:12:52 -07:00
line6
…
lirc
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-07-25 23:26:34 -07:00
mei
staging: mei: reordering the exit module cleanup
2011-07-08 13:59:54 -07:00
nvec
Staging: Add clk API note to nvec/TODO
2011-08-02 16:12:49 -07:00
octeon
Merge branch 'master' of github.com:davem330/net
2011-09-22 03:23:13 -04:00
olpc_dcon
…
panel
Remove unneeded version.h include from drivers/staging/panel/panel.c
2011-07-05 10:39:39 -07:00
phison
…
pohmelfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2011-07-22 19:02:39 -07:00
quatech_usb2
…
quickstart
…
rtl8187se
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
rtl8192e
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
rtl8192u
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-08-20 10:39:12 -07:00
rtl8712
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-07-25 23:26:34 -07:00
rts_pstor
staging:rts_pstor: fix thread synchronization flow
2011-08-08 12:05:34 -07:00
sbe-2t3e3
…
sep
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
2011-07-25 23:26:34 -07:00
serqt_usb2
…
slicoss
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
sm7xx
…
solo6x10
drivers:staging:solo6x10:add the missed slab.h
2011-08-03 07:44:38 -07:00
speakup
drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error
2011-08-02 16:09:46 -07:00
spectra
spectra: enable device before poking it
2011-07-18 13:22:53 -07:00
ste_rmi4
staging: ste_rmi4: remove cross-dependent platform data
2011-07-05 20:29:16 -07:00
tidspbridge
staging: tidspbridge: fix compilation on dsp clock functions
2011-08-24 14:35:26 -07:00
tm6000
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-30 00:08:53 -07:00
usbip
staging: usbip: userspace: usbip-utils 1.1.1
2011-07-08 14:01:18 -07:00
vme
…
vt6655
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
vt6656
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
winbond
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
wlags49_h2
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
wlags49_h25
…
wlan-ng
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
xgifb
Remove unneeded version.h includes from drivers/staging/xgifb/
2011-07-05 10:39:37 -07:00
zcache
staging: zcache: fix cleancache crash
2011-09-20 14:17:13 -07:00
zram
Staging: zram: Fix kunmapping order
2011-07-18 13:22:52 -07:00
Kconfig
staging: remove ath6kl
2011-08-13 14:48:06 -04:00
Makefile
staging: remove ath6kl
2011-08-13 14:48:06 -04:00
staging.c
…