Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
e857bfd460
linux/drivers/staging/cxt1e1
History
Linus Torvalds aa77677e0a Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups
2011-10-26 15:39:02 +02:00
..
comet_tables.c
comet_tables.h
comet.c Staging: cxt1e1: rename global log_level variable 2010-12-10 10:46:30 -08:00
comet.h
functions.c Staging: cxt1e1: rename global log_level variable 2010-12-10 10:46:30 -08:00
hwprobe.c staging/trivial: fix typos concerning "consistent" 2011-02-18 13:30:10 -08:00
Kconfig doc: fix broken references 2011-09-27 18:08:04 +02:00
libsbew.h
linux.c staging: irq: Remove IRQF_DISABLED 2011-09-16 20:09:38 +02:00
Makefile Staging: cxt1e1: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:50 -07:00
musycc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
musycc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ossiRelease.c
pmc93x6_eeprom.c Staging: cxt1e1: remove all code dependent on LINUX_VERSION_CODE 2010-06-18 15:16:21 -07:00
pmc93x6_eeprom.h
pmcc4_cpld.h
pmcc4_defs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
pmcc4_drv.c staging/trivial: fix typos concerning "consistent" 2011-02-18 13:30:10 -08:00
pmcc4_ioctls.h
pmcc4_private.h staging: cxt1e1: fix semaphore build breakage 2010-05-11 14:15:34 -07:00
pmcc4_sysdep.h
pmcc4.h staging/trivial: fix typos concerning "consistent" 2011-02-18 13:30:10 -08:00
sbe_bid.h
sbe_promformat.h
sbecom_inline_linux.h staging/cxt1e1: Header cleanup 2011-09-06 16:49:30 -07:00
sbecrc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sbeid.c
sbeproc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sbeproc.h
sbew_ioc.h