github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
7cd3739f32
linux/drivers/staging
History
黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +08:00
..
altpciechdma Staging: altpciechdma: 64bit type warning fix 2009-09-15 12:02:26 -07:00
android add timed gpio support for A22 2011-04-19 14:04:03 +08:00
asus_oled Staging: asus_oled: fix up my fixup for some sysfs attribute permissions 2010-12-09 13:26:35 -08:00
b3dfg Staging: b3dfg: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
comedi Staging: comedi: jr3_pci: Don't ioremap too much space. Check result. 2011-03-14 14:29:59 -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: frontier: fix up some sysfs attribute permissions 2010-12-09 13:27:04 -08:00
go7007 V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250 2009-11-30 17:49:15 -02:00
hv staging: hv: use sync_bitops when interacting with the hypervisor 2011-04-14 16:53:23 -07:00
iio fixed make menuconfig err 2011-03-25 20:00:46 -07:00
line6 Staging: line6: fix up some sysfs attribute permissions 2010-12-09 13:26:36 -08:00
octeon Staging: octeon-ethernet: Assign proper MAC addresses. 2009-11-23 18:55:34 +00: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 double-calling of parport_release - fix oops. 2010-08-13 13:19:33 -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
rk29 rk29: clock: fix codec pll; add rk29_clock_init2 API to support configure codec pll rate 2011-06-15 16:20:11 +08:00
rk2818 修改不能重启（reboot）的BUG,reboot前ddr降频到136M，arm降频24M，关闭dsp，关闭lcdc 2010-09-30 17:56:16 +08:00
rt2860 rt2860sta: Fix argument to linux_pci_unmap_single() 2010-04-01 15:58:46 -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 staging: rtl8187se: Change panic to warn when RF switch turned off 2010-12-09 13:27:04 -08:00
rtl8192e Staging: fix wireless drivers depends 2009-10-30 14:47:44 -07:00
rtl8192su Staging: rtl8192su: add device ids 2011-05-09 15:55:09 -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
udlfb Staging: udlfb: fix printk format warning 2009-09-15 12:02:06 -07:00
usbip USB: fix regression in usbip by setting has_tt flag 2011-05-09 15:54:57 -07:00
vme Staging: vme: fix sched.h build breakage 2009-10-14 14:14:36 -07:00
vt6655 Staging: vt6655: fix buffer overflow 2010-09-26 17:21:24 -07:00
vt6656 Staging: update TODO files 2009-11-30 16:39:42 -08: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 remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00
Makefile Merge remote branch 'linux-2.6.32.y/master' into develop 2010-12-16 20:54:24 +08:00
staging.c