Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
9bab0b7fba
linux/drivers/staging/bcm
History
Linus Torvalds 1380516599 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: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h
2011-07-25 23:26:34 -07:00
..
Adapter.h Fix common misspellings 2011-03-31 11:26:23 -03:00
Bcmchar.c staging: bcm: optimize kmalloc to kzalloc 2011-03-09 15:54:31 -08:00
Bcmnet.c Staging: bcm: Bcmnet: fixed checkpatch script reported issues 2011-03-09 15:54:30 -08:00
CmHost.c Fix common misspellings 2011-03-31 11:26:23 -03:00
CmHost.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
cntrl_SignalingInterface.h Fix common misspellings 2011-03-31 11:26:23 -03:00
DDRInit.c Staging: beceem: Use 32-bit integers for hardware register values 2010-11-10 16:28:30 -08:00
DDRInit.h
Debug.h staging: Fix recieve/receive typos 2011-06-28 14:54:17 -07:00
HandleControlPacket.c beceem: dump control packet information 2010-11-01 14:10:41 -04:00
headers.h Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
hostmibs.c beceem: statistics and transmit queue changes 2010-11-01 13:53:30 -04:00
HostMIBSInterface.h Fix common misspellings 2011-03-31 11:26:23 -03:00
InterfaceAdapter.h
InterfaceDld.c Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values 2010-11-10 16:28:31 -08:00
InterfaceIdleMode.c Fix common misspellings 2011-03-31 11:26:23 -03:00
InterfaceIdleMode.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
InterfaceInit.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
InterfaceInit.h Staging: Beceem: add USB id for BCSM250 Mobile WiMAX 2010-12-06 16:09:43 -08:00
InterfaceIsr.c Fix common misspellings 2011-03-31 11:26:23 -03:00
InterfaceIsr.h
InterfaceMacros.h
InterfaceMisc.c Staging: bcm: signedness bug in StoreSFParam() 2010-11-16 12:31:50 -08:00
InterfaceMisc.h beceem: remove indirection to Adapter structure 2010-11-01 09:52:14 -04:00
InterfaceRx.c staging: Fix recieve/receive typos 2011-06-28 14:54:17 -07:00
InterfaceRx.h
InterfaceTx.c Staging: Beceem: remove old kernel compatibility code 2010-12-06 16:09:45 -08:00
InterfaceTx.h beceem: remove dead code 2010-11-01 09:50:16 -04:00
Ioctl.h Fix common misspellings 2011-03-31 11:26:23 -03:00
IPv6Protocol.c Fix common misspellings 2011-03-31 11:26:23 -03:00
IPv6ProtocolHdr.h beceem: make local functions static 2010-11-01 12:37:05 -04:00
Kconfig
LeakyBucket.c Fix common misspellings 2011-03-31 11:26:23 -03:00
led_control.c beceem: statistics and transmit queue changes 2010-11-01 13:53:30 -04:00
led_control.h
Macros.h staging: Fix recieve/receive typos 2011-06-28 14:54:17 -07:00
Makefile beceem: remove ARP spoofing 2010-11-01 09:53:58 -04:00
Misc.c staging: remove unnecessary code 2011-06-28 13:13:42 -07:00
nvm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
nvm.h beceem: eliminate dead code 2010-10-29 20:44:57 -07:00
PHSDefines.h staging/bcm: fix most build warnings 2010-10-05 08:50:15 -07:00
PHSModule.c staging: Fix recieve/receive typos 2011-06-28 14:54:17 -07:00
PHSModule.h staging: Fix recieve/receive typos 2011-06-28 14:54:17 -07:00
Protocol.h beceem: fix definition of VLAN header type 2010-11-01 13:54:21 -04:00
Prototypes.h beceem: change startup messages 2010-11-01 14:06:24 -04:00
Qos.c Fix common misspellings 2011-03-31 11:26:23 -03:00
Queue.h
sort.c drivers: staging: bcm: sort: kill handrolled bubblesort 2011-07-05 20:36:37 -07:00
target_params.h
TODO beceem: update TODO list 2010-11-01 14:18:16 -04:00
Transmit.c staging: fix build failure in bcm driver 2011-01-17 17:39:39 -08:00
Typedefs.h
vendorspecificextn.c
vendorspecificextn.h
Version.h