korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 10:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
c32301b595
linux/drivers/staging
History
Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
2011-01-10 16:04:53 -08:00
..
asus_oled Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ath6kl drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
autofs Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
bcm Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
brcm80211 staging: brcm80211: Fix WL_<type> logging macros 2010-12-16 12:25:37 -08:00
comedi Staging: comedi: Fix checkpatch.pl issues in file s526.c 2010-12-16 12:20:06 -08:00
cptm1217 staging: clearpad_tm1217 depends on INPUT 2010-11-19 17:17:45 -08:00
crystalhd drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
cx25821 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
cxt1e1 Staging: cxt1e1: rename global log_level variable 2010-12-10 10:46:30 -08:00
dabusb [media] dabusb: Move it to staging to be deprecated 2010-12-29 08:17:15 -02:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
echo
et131x drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 staging: ft1000: Fix kernel panic when use ioctl. 2010-12-16 12:20:05 -08:00
go7007 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
hv Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize 2010-12-16 12:37:51 -08:00
iio Staging: IIO: DDS: AD9833 / AD9834 driver 2010-12-16 12:23:03 -08:00
intel_sst Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
keucr Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
line6 staging/line6: Fix sparse warning 'Using plain integer as NULL pointer' 2010-12-08 14:31:01 -08:00
lirc Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2011-01-07 17:02:58 -08:00
memrar Staging: sep: handle the memrar stuff in the headers 2010-11-29 11:17:27 -08:00
msm staging: msm: tvenc: fix error handling 2010-11-29 11:38:50 -08:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon i2c: Drivers shouldn't include <linux/i2c-id.h> 2010-11-15 22:40:38 +01: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 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
quatech_usb2
quickstart Staging: quickstart: free after input_unregister_device() 2010-11-16 12:25:52 -08:00
rt2860 Staging: rt2860: Sanitize DBGPRINT_ERR macro 2010-12-16 12:17:29 -08: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: Change panic to warn when RF switch turned off 2010-11-16 12:25:53 -08:00
rtl8192e Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
rtl8192u Staging: rtl8192u: add missing curly braces 2010-12-10 10:39:55 -08:00
rtl8712 Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
samsung-laptop Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions 2010-11-18 11:27:19 -08:00
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
se401 [media] staging: se401 depends on USB 2010-12-30 22:29:41 -02:00
sep staging: sep: fix comments in sep_get_static_pool_addr_handler 2010-12-10 10:39:55 -08:00
serqt_usb2
slicoss
sm7xx Staging: sm7xx: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
smbfs fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
solo6x10 staging: solo6010 depends on I2C 2010-12-09 16:29:49 -08:00
speakup Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
spectra Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ste_rmi4 staging: fix ste_rmi4 build, depends on INPUT 2010-11-16 12:31:48 -08:00
ti-st staging: ti-st: move TI_ST from staging to misc/ 2010-10-06 08:25:06 -07:00
tidspbridge Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
tm6000 [media] tm6000: Fix mutex unbalance 2010-12-29 08:17:21 -02:00
usbip staging: usbip: remove double giveback of URB 2011-01-10 12:26:02 -08:00
usbvideo [media] staging: usbvideo/vicam depends on USB 2010-12-30 22:29:39 -02:00
vme Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:47 -08:00
vt6655 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
vt6656 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
westbridge Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
winbond Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wlags49_h2 drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
wlags49_h25 Staging: wlags49_h25: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
wlan-ng Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
xgifb staging: Use vzalloc 2010-11-09 16:34:01 -08:00
zram Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
Kconfig Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
Makefile Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
staging.c