linux/drivers/staging
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
altpciechdma
android Staging: android: mark subsystem as broken 2009-10-30 14:47:44 -07:00
arlan staging/wireless: don't build when NET etc. are not enabled 2009-11-11 15:23:48 -05:00
asus_oled
b3dfg Staging: b3dfg: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
comedi Staging: comedi: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
cx25821
dream
dst
echo
et131x Staging: et131x: Fix the add_10bit macro 2009-10-14 14:14:39 -07:00
frontier
go7007
hv Staging: hv: fix oops in vmbus - missing #include 2009-10-30 14:47:43 -07:00
iio staging: Complete sched.h removal from interrupt.h 2009-10-14 14:14:37 -07:00
line6
mimio
netwave staging/wireless: don't build when NET etc. are not enabled 2009-11-11 15:23:48 -05:00
octeon
otus Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
p9auth Staging: p9auth: a few fixes 2009-10-09 13:47:24 -07:00
panel Staging: Panel: prevent driver from calling misc_deregister twice on same ressource 2009-10-30 14:47:43 -07:00
phison
poch Staging: poch: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
pohmelfs
quatech_usb2
rar
rt2860 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rt2870 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rt3070
rt3090 Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
rtl8187se Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
rtl8192e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
rtl8192su Staging: fix wireless drivers depends 2009-10-30 14:47:44 -07:00
sep staging: Complete sched.h removal from interrupt.h 2009-10-14 14:14:37 -07:00
serqt_usb2
slicoss
strip Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2009-11-09 11:17:24 -08:00
udlfb
usbip
vme Staging: vme: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
vt6655
vt6656 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
wavelan znet: fix build failure from i82593.h relocation 2009-11-17 10:16:32 -05:00
winbond Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
wlan-ng Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
Kconfig Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
Makefile Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
staging.c