mirror of https://gitee.com/openkylin/linux.git
1380516599
* '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 |
||
|---|---|---|
| .. | ||
| Adapter.h | ||
| Bcmchar.c | ||
| Bcmnet.c | ||
| CmHost.c | ||
| CmHost.h | ||
| DDRInit.c | ||
| DDRInit.h | ||
| Debug.h | ||
| HandleControlPacket.c | ||
| HostMIBSInterface.h | ||
| IPv6Protocol.c | ||
| IPv6ProtocolHdr.h | ||
| InterfaceAdapter.h | ||
| InterfaceDld.c | ||
| InterfaceIdleMode.c | ||
| InterfaceIdleMode.h | ||
| InterfaceInit.c | ||
| InterfaceInit.h | ||
| InterfaceIsr.c | ||
| InterfaceIsr.h | ||
| InterfaceMacros.h | ||
| InterfaceMisc.c | ||
| InterfaceMisc.h | ||
| InterfaceRx.c | ||
| InterfaceRx.h | ||
| InterfaceTx.c | ||
| InterfaceTx.h | ||
| Ioctl.h | ||
| Kconfig | ||
| LeakyBucket.c | ||
| Macros.h | ||
| Makefile | ||
| Misc.c | ||
| PHSDefines.h | ||
| PHSModule.c | ||
| PHSModule.h | ||
| Protocol.h | ||
| Prototypes.h | ||
| Qos.c | ||
| Queue.h | ||
| TODO | ||
| Transmit.c | ||
| Typedefs.h | ||
| Version.h | ||
| cntrl_SignalingInterface.h | ||
| headers.h | ||
| hostmibs.c | ||
| led_control.c | ||
| led_control.h | ||
| nvm.c | ||
| nvm.h | ||
| sort.c | ||
| target_params.h | ||
| vendorspecificextn.c | ||
| vendorspecificextn.h | ||