openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/staging
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
 		2010-10-24 13:41:39 -07:00
..
adis16255 Staging: adis16255: missing spacess in log messages added 2010-06-18 15:16:20 -07:00
asus_oled Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
batman-adv Revert: "Staging: batman-adv: Adding netfilter-bridge hooks" 2010-09-20 16:31:54 -07:00
comedi Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
crystalhd llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
cx25821 BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
cxt1e1 Staging: cxt1e1: remove code guarded by GENERIC_HDLC_VERSION 2010-06-18 15:20:59 -07:00
dream llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
dt3155v4l Staging: dt3155v4l: correcting a pointer mismatch bug and cleanups 2010-06-18 16:50:04 -07:00
easycap BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
echo
…
et131x Staging: et131x: Small format/style tidyups 2010-06-17 16:08:45 -07:00
frontier llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
go7007 BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
hv block: autoconvert trivial BKL users to private mutex 2010-10-05 15:01:10 +02:00
iio llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
line6 Staging: line6: needs to select SND_PCM 2010-07-28 08:20:55 -07:00
lirc llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
memrar llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
mrst-touchscreen Staging: mrst-touchscreen: fix dereferencing free memory 2010-06-30 08:18:14 -07:00
msm staging: msm: remove video drivers for obsolete platforms 2010-07-26 15:39:31 -07:00
octeon Staging: octeon: depends on NETDEVICES 2010-09-03 17:37:16 -07:00
otus Staging: comedi : fix brace coding style issue in wwrap.c 2010-08-02 18:27:42 -07:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: depends on ATA_BMDMA 2010-06-04 13:38:57 -07:00
pohmelfs fs: fs_struct rwlock to spinlock 2010-08-18 08:35:46 -04:00
quatech_usb2 Staging: quatech_usb2: remove unused qt2_box_flush function 2010-08-02 18:25:27 -07:00
quickstart Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
rt2860 Staging: rt2870sta: Add more device IDs from vendor drivers 2010-09-03 17:37:15 -07:00
rt2870
…
rtl8187se param: remove unnecessary writable charp 2010-08-11 23:04:27 +09:30
rtl8192e param: remove unnecessary writable charp 2010-08-11 23:04:27 +09:30
rtl8192su param: remove unnecessary writable charp 2010-08-11 23:04:27 +09:30
rtl8192u Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
samsung-laptop
…
serqt_usb2
…
slicoss Staging: slicoss: Remove net_device_stats from the driver's private 2010-08-02 18:25:26 -07:00
sm7xx staging: sm7xx: Fixup of the section mismatch 2010-07-22 14:32:59 -07:00
solo6x10 Staging: solo: add delay.h header 2010-07-08 13:57:58 -07:00
spectra block: autoconvert trivial BKL users to private mutex 2010-10-05 15:01:10 +02:00
ti-st Staging: ti-st: remove st_get_plat_device 2010-09-24 11:04:32 -07:00
tidspbridge llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
tm6000 V4L/DVB: tm6000: bugfix data handling 2010-09-27 22:22:02 -03:00
udlfb Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-05-21 15:26:46 -07:00
usbip BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
vme Staging: autoconvert trivial BKL users to private mutex 2010-07-22 11:10:29 -07:00
vt6655 Staging: vt6655: fix buffer overflow 2010-09-20 16:31:54 -07:00
vt6656 staging: vt6656: removed NTSTATUS definition 2010-08-02 18:19:04 -07:00
winbond Staging: Merge staging-next into Linus's tree 2010-08-05 14:18:03 -07:00
wlags49_h2 pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
wlags49_h25 Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependencies 2010-06-04 13:38:57 -07:00
wlan-ng Staging: wlan-ng: Explicitly set some fields in cfg80211 interface 2010-09-03 17:37:16 -07:00
xgifb Staging: xgifb: increase VBIOS_VER_MAX_LENGTH to 5 2010-06-22 14:33:36 -07:00
zram Staging: zram: free device memory when init fails 2010-09-03 17:37:15 -07:00
Kconfig Staging: sep: remove driver 2010-08-23 18:15:38 -07:00
Makefile Staging: sep: remove driver 2010-08-23 18:15:38 -07:00
staging.c
…