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 6d6b89bd2e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt
 		2010-03-02 07:55:08 -08:00
..
altpciechdma Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
arlan staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
asus_oled Staging: asus_oled: fix oops in 2.6.32.2 2010-01-20 15:05:25 -08:00
b3dfg Staging: b3dfg: remove check for pci bus master 2009-12-11 12:21:46 -08:00
batman-adv Staging: batman-adv: introduce missing kfree 2009-12-23 11:27:50 -08:00
comedi Staging: comedi: jr3_pci: Don't ioremap too much space. Check result. 2009-12-23 11:27:46 -08:00
cx25821 V4L/DVB (13955): cx25821: fix double unlock in medusa_video_init() 2010-01-17 11:31:38 -02:00
dream Staging: dream: add gpio and pmem support 2009-12-11 12:23:21 -08:00
echo Staging: echo: coding style cleanups 2009-09-15 12:02:16 -07:00
et131x staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
frontier
…
go7007 V4L/DVB: s2250: Fix write_reg i2c address 2010-02-26 15:10:45 -03:00
hv block: Consolidate phys_segment and hw_segment limits 2010-02-26 13:58:08 +01:00
iio drop explicit include of autoconf.h 2009-12-12 13:08:15 +01:00
line6 staging: line6: Convert simple_strtoul to strict_strtoul in midi.c 2009-12-11 12:21:48 -08:00
mimio
…
netwave net: use netdev_mc_count and netdev_mc_empty when appropriate 2010-02-12 11:38:58 -08:00
octeon Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
otus Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
p9auth Staging: p9auth: adding __init/__exit macros 2009-12-11 12:23:04 -08:00
panel Staging: panel: Adjust range for PANEL_KEYPAD in Kconfig 2009-12-23 11:27:49 -08:00
phison libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
poch Staging: poch: Add sample Rx code 2009-12-11 12:23:09 -08:00
pohmelfs pohmelfs needs I_LOCK 2009-12-22 12:27:33 -05:00
quatech_usb2 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
ramzswap Staging: ramzswap: remove ARM specific d-cache hack 2009-12-23 11:27:49 -08:00
rar Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rt2860 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
rt2870 Staging: rt28x0: Add proper selection of WIRELESS_EXT and WEXT_PRIV 2009-12-11 12:23:16 -08:00
rt3070 Staging: rt28x0: remove typedefs (part one) 2009-12-11 12:23:15 -08:00
rt3090 Staging: rt28x0: remove typedefs (part one) 2009-12-11 12:23:15 -08:00
rtl8187se Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2010-01-19 11:43:42 -08:00
rtl8192e Staging: rtl8192x: fix printk formats 2009-12-23 11:27:48 -08:00
rtl8192su Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2010-02-25 23:26:21 -08:00
rtl8192u Staging: rtl8192x: fix printk formats 2009-12-23 11:27:48 -08:00
samsung-laptop Staging: samsung-laptop: add TODO file 2009-12-11 12:23:23 -08:00
sep Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
serqt_usb2 Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
slicoss staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
sm7xx MIPS: Loongson: Change the Email address of Wu Zhangjin 2010-02-27 12:53:12 +01:00
strip Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2009-11-09 11:17:24 -08:00
udlfb Staging: udlfb: fix printk format warning 2009-09-15 12:02:06 -07:00
usbip Staging: usbip: Fix typo "Contoroller". 2009-12-11 12:23:19 -08:00
vme staging: vme: Fix mutex locking 2009-12-11 12:23:18 -08:00
vt6655 staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
vt6656 staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
wavelan staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
winbond Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
wlags49_h2 staging: convert to use netdev_for_each_mc_addr 2010-02-18 14:47:51 -08:00
wlags49_h25 Staging: wlags49: fix kconfigs dependancy 2009-12-11 12:23:10 -08:00
wlan-ng Staging: wlan-ng: fix Correct size given to memset 2009-12-23 11:27:48 -08:00
Kconfig Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2010-02-01 10:46:49 -08:00
Makefile Staging: dst: remove from the tree 2009-12-23 11:27:45 -08:00
staging.c
…