kernel-fxtec-pro1x/include/linux/usb
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
..
association.h
atmel_usba_udc.h
audio.h ALSA: usbaudio: consolidate header files 2010-02-23 08:51:56 +01:00
c67x00.h
cdc.h
ch9.h
composite.h
ehci_def.h
g_printer.h
gadget.h
gadgetfs.h
gpio_vbus.h
input.h
iowarrior.h
irda.h
isp116x.h
isp1362.h
isp1760.h
Kbuild
langwell_udc.h
m66592.h
midi.h
musb.h
net2280.h
otg.h
quirks.h
r8a66597.h
rndis_host.h
serial.h
sl811.h
tmc.h
ulpi.h
usbnet.h
video.h
vstusb.h
wusb-wa.h
wusb.h