1
linux/drivers/staging
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
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
dream llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
dt3155v4l
easycap BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
echo
et131x
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
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
msm
octeon Staging: octeon: depends on NETDEVICES 2010-09-03 17:37:16 -07:00
otus
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison
pohmelfs fs: fs_struct rwlock to spinlock 2010-08-18 08:35:46 -04:00
quatech_usb2
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
sm7xx
solo6x10
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
usbip BKL: introduce CONFIG_BKL. 2010-10-21 15:44:13 +02:00
vme
vt6655 Staging: vt6655: fix buffer overflow 2010-09-20 16:31:54 -07:00
vt6656
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
wlan-ng Staging: wlan-ng: Explicitly set some fields in cfg80211 interface 2010-09-03 17:37:16 -07:00
xgifb
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