q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
asus_oled Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
ath6kl
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
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
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
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison
pohmelfs Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
quatech_usb2
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
rtl8187se
rtl8192e
rtl8192u
rtl8712
samsung-laptop
sbe-2t3e3
serqt_usb2
slicoss
sm7xx
smbfs Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
solo6x10
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
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
usbip Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vme
vt6655 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
vt6656
westbridge
winbond
wlags49_h2 Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
wlags49_h25
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