OpenCloudOS-Kernel/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 Staging: altpciechdma: 64bit type warning fix 2009-09-15 12:02:26 -07:00
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 Staging: asus_oled: Cleaned up checkpatch issues. 2009-09-15 12:02:33 -07:00
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 V4L/DVB (12851): cx25821/Makefile: Cleanup 2009-09-19 00:13:35 -03:00
dream Staging: dream: introduce missing kfree 2009-09-15 12:02:34 -07:00
dst Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 2009-10-04 12:39:14 -07:00
echo Staging: echo: coding style cleanups 2009-09-15 12:02:16 -07:00
et131x Staging: et131x: Fix the add_10bit macro 2009-10-14 14:14:39 -07:00
frontier Staging: remove unused #include <linux/version.h>'s 2009-06-19 11:00:36 -07:00
go7007 V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place 2009-09-22 21:53:26 -03:00
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 Staging: line6: ffzb returns an unsigned integer 2009-09-15 12:02:34 -07:00
mimio Staging: mimio: depends on INPUT 2009-04-03 14:53:29 -07:00
netwave staging/wireless: don't build when NET etc. are not enabled 2009-11-11 15:23:48 -05:00
octeon MIPS: Octeon: False positive timeout 2009-09-17 20:07:41 +02:00
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 Staging: phison: depends on PCI 2009-04-03 14:53:40 -07:00
poch Staging: poch: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
pohmelfs pohmelfs/connector: Disallow unpliviged users to configure pohmelfs 2009-10-02 10:54:15 -07:00
quatech_usb2 Staging: quatech_usb2: Improvements to set_termios method 2009-09-15 12:01:36 -07:00
rar Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names 2009-09-15 12:02:12 -07:00
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 Staging: remove no longer needed rt3070 driver 2009-09-15 12:02:23 -07:00
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 Staging: serqt_usb2: fix qt_open parameters 2009-09-15 12:02:06 -07:00
slicoss Staging: ARRAY_SIZE changes 2009-09-15 12:02:06 -07:00
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 Staging: udlfb: fix printk format warning 2009-09-15 12:02:06 -07:00
usbip Staging: usb-ip: vhci_hdc:Fix the returned error value 2009-09-15 12:02:05 -07:00
vme Staging: vme: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
vt6655 staging: Add proper selection of WIRELESS_EXT and WEXT_PRIV 2009-10-07 16:39:43 -04:00
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