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 f063a0c0c9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
  Staging: brcm80211: fix usage of roundup in structures
  Staging: bcm: fix up network device reference counting
  Staging: keucr: fix up US_ macro change
  staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
  staging: brcm80211: Remove unnecessary header files.
  staging: brcm80211: Remove unnecessary includes from bcmutils.c
  staging: brcm80211: Removed unnecessary pktsetprio() function.
  Staging: brcm80211: remove typedefs.h
  Staging: brcm80211: remove uintptr typedef usage
  Staging: hv: remove struct vmbus_channel_interface
  Staging: hv: remove Open from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_open directly
  Staging: hv: netvsc: call vmbus_open directly
  Staging: hv: channel: export vmbus_open to modules
  Staging: hv: remove Close from struct vmbus_channel_interface
  Staging: hv: netvsc: call vmbus_close directly
  Staging: hv: storvsc: call vmbus_close directly
  Staging: hv: channel: export vmbus_close to modules
  Staging: hv: remove SendPacket from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_sendpacket directly
  ...

Fix up conflicts in
	drivers/staging/cx25821/cx25821-audio-upstream.c
	drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
 		2010-10-28 12:13:00 -07:00
..
adis16255 staging: adis16255: fix sysfs leak 2010-08-31 14:51:53 -07:00
asus_oled Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
ath6kl staging: ath6kl: use free_netdev(netdev) instead of kfree() 2010-09-30 04:14:08 -07:00
autofs Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
batman-adv staging: batman-adv: remove useless addr_to_string() 2010-10-20 15:48:40 -07:00
bcm Staging: bcm: fix up network device reference counting 2010-10-28 09:54:23 -07:00
brcm80211 Staging: brcm80211: fix usage of roundup in structures 2010-10-28 09:55:53 -07:00
comedi Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
cpia V4L/DVB: Deprecate cpia driver (used for parallel port webcams) 2010-10-21 01:06:13 -02:00
crystalhd Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
cx25821 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
cxt1e1 Staging: cxt1e1: multiple definition of max_mtu fix 2010-10-19 10:12:14 -07:00
dream Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
dt3155v4l V4L/DVB: videobuf: add queue argument to videobuf_waiton() 2010-10-21 01:06:14 -02:00
easycap Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
echo
…
et131x Staging: et131x: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:49 -07:00
frontier Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
ft1000 staging: ft1000: Remove FT1000_INFO typedef usage. 2010-10-19 10:08:51 -07:00
go7007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
hv Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
iio Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
intel_sst Staging: sst: more copy_to_user() changes 2010-10-15 15:42:26 -07:00
keucr Staging: keucr: fix up US_ macro change 2010-10-28 09:53:38 -07:00
line6 Staging: line6: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:47 -07:00
lirc Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
memrar llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
msm staging: msm: Remove pr_<level> uses of KERN_<level> 2010-09-16 12:37:36 -07:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon Staging: olpc_dcon: mark the driver as CONFIG_BROKEN for now 2010-10-05 12:08:48 -07:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: fix problem caused by libata change 2010-10-09 13:26:12 -07:00
pohmelfs Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
quatech_usb2 staging/trivial: fix typos concerning "initiali[zs]e" 2010-09-04 21:23:26 -07:00
quickstart Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
rt2860 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
rt2870 Staging: rt2870: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:46 -07:00
rtl8187se Staging: rtl8187se: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
rtl8192e Staging: rtl8192e: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
rtl8192u Staging: rtl8192u: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:42 -07:00
rtl8712 Staging: rtl8712: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
samsung-laptop
…
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
serqt_usb2
…
slicoss staging: slicoss: use free_netdev(netdev) instead of kfree() 2010-09-30 04:14:21 -07:00
sm7xx staging: sm7xx: call disable_pci_device() if pci_probe() failed 2010-08-31 14:48:09 -07:00
smbfs Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
solo6x10 Staging: solo6x10: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:43 -07:00
speakup staging: speakup: fix memory leak 2010-10-19 10:10:54 -07:00
spectra Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
stradis V4L/DVB: Deprecate stradis driver 2010-10-21 01:06:13 -02:00
ti-st staging: ti-st: move TI_ST from staging to misc/ 2010-10-06 08:25:06 -07:00
tidspbridge Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
tm6000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
udlfb staging: udlfb: fix checkpatch and style 2010-09-05 19:46:14 -07:00
usbip Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vme Staging: vme: Assure D16 cycle if required in master_read and master_write 2010-09-30 04:33:26 -07:00
vt6655 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vt6656 Staging: vt6656: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
westbridge staging: west bridge, block driver change for partition support 2010-10-05 20:28:34 -07:00
winbond Staging: winbond: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:40 -07:00
wlags49_h2 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
wlags49_h25 Staging: wlags49_h25: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
wlan-ng Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
xgifb Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
zram Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
staging.c
…