1
linux/drivers/staging
John W. Linville b38d355eaa Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c
2011-08-22 14:28:50 -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 net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
comedi Staging: comedi: fix printk issue in rtd520.c 2011-07-08 14:11:18 -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
dt3155v4l drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h 2011-08-02 16:09:47 -07:00
easycap
echo
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: Fix clashes with DRM updates 2011-08-02 16:06:18 -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
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
nvec Staging: Add clk API note to nvec/TODO 2011-08-02 16:12:49 -07:00
octeon net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
olpc_dcon
panel
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
tidspbridge atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -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
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
zcache zcache: Fix build error when sysfs is not defined 2011-08-08 12:05:35 -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