tmp_suning_uos_patched/drivers/usb/serial
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
..
aircable.c
ark3116.c
belkin_sa.c
belkin_sa.h
bus.c
ch341.c
ChangeLog.history
console.c
cp210x.c
cyberjack.c
cypress_m8.c
cypress_m8.h
digi_acceleport.c
empeg.c
ezusb_convert.pl
ezusb.c
ftdi_sio_ids.h USB: ftdi_sio: Add D.O.Tec PID 2010-12-10 13:01:52 -08:00
ftdi_sio.c USB: Merge 2.6.37-rc5 into usb-next 2010-12-22 12:25:34 -08:00
ftdi_sio.h
funsoft.c
garmin_gps.c
generic.c
hp4x.c
io_16654.h
io_edgeport.c
io_edgeport.h
io_ionsp.h
io_tables.h
io_ti.c
io_ti.h
io_usbvend.h
ipaq.c
ipw.c
ir-usb.c
iuu_phoenix.c
iuu_phoenix.h
Kconfig
keyspan_pda.c
keyspan_usa26msg.h
keyspan_usa28msg.h
keyspan_usa49msg.h
keyspan_usa67msg.h
keyspan_usa90msg.h
keyspan.c
keyspan.h
kl5kusb105.c
kl5kusb105.h
kobil_sct.c
kobil_sct.h
Makefile
Makefile-keyspan_pda_fw
mct_u232.c
mct_u232.h
mos7720.c
mos7840.c
moto_modem.c
navman.c
omninet.c
opticon.c
option.c 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
oti6858.c usb: don't use flush_scheduled_work() 2010-12-24 16:14:20 +01:00
oti6858.h
pl2303.c
pl2303.h
qcaux.c
qcserial.c
safe_serial.c
sam-ba.c
siemens_mpi.c
sierra.c
spcp8x5.c
ssu100.c USB: ssu100: remove max_packet_size calculation 2010-11-11 05:51:15 -08:00
symbolserial.c
ti_usb_3410_5052.c
ti_usb_3410_5052.h
usb_debug.c
usb_wwan.c USB: serial: usb_wwan: Add missing uaccess.h / fix build failure 2010-12-10 14:18:36 -08:00
usb-serial.c USB: fix autosuspend bug in usb-serial 2010-11-30 10:28:07 -08:00
usb-wwan.h usb-wwan: implement TIOCGSERIAL and TIOCSSERIAL to avoid blocking close(2) 2010-11-30 16:44:57 -08:00
visor.c
visor.h
vivopay-serial.c
whiteheat.c
whiteheat.h
zio.c