UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/staging
History
Linus Torvalds df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
 		2011-04-07 11:36:44 -07:00
..
altera-stapl [media] staging: altera-jtag needs delay.h 2011-03-31 18:49:34 -03:00
asus_oled Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ath6kl Fix common misspellings 2011-03-31 11:26:23 -03:00
bcm Fix common misspellings 2011-03-31 11:26:23 -03:00
brcm80211 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
comedi Fix common misspellings 2011-03-31 11:26:23 -03:00
cptm1217 Fix common misspellings 2011-03-31 11:26:23 -03:00
crystalhd Fix common misspellings 2011-03-31 11:26:23 -03:00
cs5535_gpio staging: cs5535_gpio: check put_user() return code 2011-01-21 12:35:14 -08:00
cx25821 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
cxd2099 [media] ngene: Fix compilation when cxd2099 is not enabled 2011-03-21 20:31:48 -03:00
cxt1e1 Fix common misspellings 2011-03-31 11:26:23 -03:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
echo staging: echo: fix a typo ("overflow") 2011-03-02 16:03:59 -05:00
et131x Fix common misspellings 2011-03-31 11:26:23 -03:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
generic_serial Fix common misspellings 2011-03-31 11:26:23 -03:00
gma500 Fix common misspellings 2011-03-31 11:26:23 -03:00
go7007 Fix common misspellings 2011-03-31 11:26:23 -03:00
hv Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
iio Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
intel_sst Fix common misspellings 2011-03-31 11:26:23 -03:00
keucr Fix common misspellings 2011-03-31 11:26:23 -03:00
line6 staging: line6: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
lirc Fix common misspellings 2011-03-31 11:26:23 -03:00
msm Fix common misspellings 2011-03-31 11:26:23 -03:00
octeon Fix common misspellings 2011-03-31 11:26:23 -03:00
olpc_dcon Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
pohmelfs Fix common misspellings 2011-03-31 11:26:23 -03:00
quatech_usb2 Fix common misspellings 2011-03-31 11:26:23 -03:00
quickstart Staging: quickstart: fixed coding style issues 2011-02-09 12:11:55 -08:00
rt2860 Fix common misspellings 2011-03-31 11:26:23 -03:00
rt2870 Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl8187se Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192u Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8712 Fix common misspellings 2011-03-31 11:26:23 -03:00
rts_pstor Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
samsung-laptop backlight: add backlight type 2011-03-22 17:43:59 -07:00
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
sep Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
serqt_usb2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
slicoss Fix common misspellings 2011-03-31 11:26:23 -03:00
sm7xx Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
solo6x10 staging: Solo6x10: Changed solo6010* -> solo*, solo6x10* etc. 2011-02-18 12:37:04 -08:00
speakup Fix common misspellings 2011-03-31 11:26:23 -03:00
spectra Fix common misspellings 2011-03-31 11:26:23 -03:00
ste_rmi4 Fix common misspellings 2011-03-31 11:26:23 -03:00
tidspbridge Fix common misspellings 2011-03-31 11:26:23 -03:00
tm6000 Fix common misspellings 2011-03-31 11:26:23 -03:00
tty Fix common misspellings 2011-03-31 11:26:23 -03:00
usbip Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
vme Fix common misspellings 2011-03-31 11:26:23 -03:00
vt6655 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
vt6656 Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
westbridge Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
winbond Fix common misspellings 2011-03-31 11:26:23 -03:00
wlags49_h2 Fix common misspellings 2011-03-31 11:26:23 -03:00
wlags49_h25 Fix common misspellings 2011-03-31 11:26:23 -03:00
wlan-ng Fix common misspellings 2011-03-31 11:26:23 -03:00
xgifb Fix common misspellings 2011-03-31 11:26:23 -03:00
zcache staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
zram staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
Kconfig staging: memrar: remove driver from tree 2011-04-04 21:41:20 -07:00
Makefile staging: memrar: remove driver from tree 2011-04-04 21:41:20 -07:00
staging.c
…