WSL2-Linux-Kernel/drivers/staging
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
arlan
asus_oled
b3dfg
batman-adv
comedi
cx25821
dream
echo
et131x
frontier
go7007
hv
iio
line6
mimio
netwave
octeon Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
otus
p9auth
panel
phison libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
poch
pohmelfs
quatech_usb2
ramzswap
rar
rt2860
rt2870
rt3070
rt3090
rtl8187se
rtl8192e
rtl8192su
rtl8192u
samsung-laptop
sep
serqt_usb2
slicoss
sm7xx MIPS: Loongson: Change the Email address of Wu Zhangjin 2010-02-27 12:53:12 +01:00
strip
udlfb
usbip
vme
vt6655
vt6656
wavelan
winbond
wlags49_h2
wlags49_h25
wlan-ng
Kconfig
Makefile
staging.c