Linus Torvalds
ce49b6289f
Staging tree merge for 3.11-rc1
...
Here's the large staging tree merge for 3.11-rc1
Huge thing here is the Lustre client code. Unfortunatly, due to it not
building properly on a wide variety of different architectures (this was
production code???), it is currently disabled from the build so as to
not annoy people.
Other than Lustre, there are loads of comedi patches, working to clean
up that subsystem, iio updates and new drivers, and a load of cleanups
from the OPW applicants in their quest to get a summer internship.
All of these have been in the linux-next releases for a while (hence the
Lustre code being disabled.)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlHRsacACgkQMUfUDdst+yklBQCgzOUv0SlVYNhRj9KDDu1vxWTG
FnYAnRhRG9oXXkocjH6/cu+YOf21ClpZ
=WDt3
-----END PGP SIGNATURE-----
Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree update from Greg KH:
"Here's the large staging tree merge for 3.11-rc1
Huge thing here is the Lustre client code. Unfortunatly, due to it
not building properly on a wide variety of different architectures
(this was production code???), it is currently disabled from the build
so as to not annoy people.
Other than Lustre, there are loads of comedi patches, working to clean
up that subsystem, iio updates and new drivers, and a load of cleanups
from the OPW applicants in their quest to get a summer internship.
All of these have been in the linux-next releases for a while (hence
the Lustre code being disabled)"
Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due
to independent renamings in the staging driver cleanup and the USB
tree..
* tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits)
Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
staging: rtl8192u: fix line length in r819xU_phy.h
staging: rtl8192u: rename variables in r819xU_phy.h
staging: rtl8192u: fix comments in r819xU_phy.h
staging: rtl8192u: fix whitespace in r819xU_phy.h
staging: rtl8192u: fix newlines in r819xU_phy.c
staging: comedi: unioxx5: use comedi_alloc_spriv()
staging: comedi: unioxx5: fix unioxx5_detach()
silicom: checkpatch: errors caused by macros
Staging: silicom: remove the board_t typedef in bpctl_mod.c
Staging: silicom: capitalize labels in the bp_media_type enum
Staging: silicom: remove bp_media_type enum typedef
staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c
staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c
staging: rtl8192u: limit line size in r819xU_phy.c
zram: allow request end to coincide with disksize
staging: drm/imx: use generic irq chip unused field to block out invalid irqs
staging: drm/imx: use generic irqchip
staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers
...
2013-07-02 11:40:23 -07:00
..
ad5449.h
iio:dac: Add support for the ad5449
2012-10-19 18:46:51 +01:00
ad5755.h
iio:dac: Add ad5755 driver
2012-09-17 20:55:54 +01:00
ad7266.h
iio:adc: Add AD7265/AD7266 support
2012-06-30 10:15:07 +01:00
ad7298.h
staging:iio: Move the ad7298 driver out of staging
2012-11-19 22:22:15 +00:00
ad7303.h
iio:dac: Add support for the AD7303
2013-06-11 20:25:58 +01:00
ad7791.h
staging:iio:adc: Add AD7791 driver
2012-09-08 10:20:09 +01:00
ad7793.h
staging:iio: Move ad7793 driver out of staging
2012-11-30 12:57:08 +00:00
ad7887.h
staging:iio: Move the ad7887 driver out of staging
2012-11-05 20:39:54 +00:00
ads7828.h
hwmon: (ads7828) driver cleanup
2012-12-05 10:55:54 -08:00
arm-ux500-pm.h
ARM: ux500: move PM-related PRCMU functions to machine
2013-04-08 13:57:53 +02:00
asoc-imx-ssi.h
ARM: imx: remove header file mach/irqs.h
2012-10-15 10:05:43 +08:00
asoc-kirkwood.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
asoc-mx27vis.h
ASoC: mx27vis: retrieve gpio numbers from platform_data
2012-09-17 07:35:08 -04:00
asoc-palm27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
asoc-s3c.h
ASoC: Samsung: Get I2S src_clk from clock alias id.
2012-11-28 19:18:00 +00:00
asoc-s3c24xx_simtec.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
asoc-ti-mcbsp.h
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
asoc-ux500-msp.h
ARM: ux500: move mach/msp.h to <linux/platform_data/*>
2013-04-08 13:59:22 +02:00
at91_adc.h
ata-pxa.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
ata-samsung_cf.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
atmel.h
atmel: move ATMEL_MAX_UART to platform_data/atmel.h
2012-11-19 17:44:54 +01:00
brcmfmac-sdio.h
brcmfmac: define and use platform specific data for SDIO.
2013-04-12 14:27:55 -04:00
camera-mx1.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
camera-mx2.h
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
camera-mx3.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
camera-pxa.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
clk-integrator.h
clk: move IM-PD1 clocks to drivers/clk
2012-11-21 11:02:44 -08:00
clk-lpss.h
ACPI / LPSS: register clock device for Lynxpoint DMA properly
2013-05-14 10:23:58 +05:30
clk-nomadik.h
ARM: nomadik: convert to generic clock
2012-06-10 18:41:40 +02:00
clk-realview.h
clk: convert ARM RealView to common clk
2012-08-24 17:42:10 -07:00
clk-u300.h
ARM: u300: convert to common clock
2012-07-11 15:36:45 -07:00
clk-ux500.h
clk: ux500: pass clock base adresses in init call
2013-04-08 13:59:19 +02:00
clocksource-nomadik-mtu.h
ARM: plat-nomadik: move MTU, kill plat-nomadik
2012-11-05 09:55:33 +01:00
coda.h
media: coda: use genalloc API
2013-04-29 18:28:13 -07:00
cpsw.h
drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave
2013-03-13 04:38:19 -04:00
crypto-atmel.h
ARM: AT91SAM9G45: same platform data structure for all crypto peripherals
2013-03-10 16:46:41 +08:00
crypto-ux500.h
ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
2012-11-05 09:55:32 +01:00
davinci_asp.h
ASoC: McASP: remove unused variables
2012-12-07 14:46:56 +09:00
db8500_thermal.h
Thermal: Add ST-Ericsson DB8500 thermal driver.
2012-11-15 20:50:34 +08:00
dma-atmel.h
ARM: at91: move platform_data definitions
2012-09-14 11:16:40 +02:00
dma-coh901318.h
dma: coh901318: create a proper platform data file
2013-01-07 17:35:57 +01:00
dma-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
dma-imx-sdma.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
dma-imx.h
dma: imx-dma: remove cpu_is_xxx by using platform_device_id
2012-10-15 10:03:17 +08:00
dma-mmp_tdma.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
dma-mv_xor.h
dma: mv_xor: remove the pool_size from platform_data
2012-11-20 15:59:00 +01:00
dma-ste-dma40.h
dmaengine: ste_dma40: add software lli support
2013-01-14 10:51:08 +01:00
dmtimer-omap.h
ARM: OMAP: Add platform data header for DMTIMERs
2012-11-16 10:35:08 -06:00
dsp-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
dwc3-exynos.h
dwc3-omap.h
usb: dwc3: omap: remove platform data associated with dwc3-omap
2013-03-18 11:16:38 +02:00
efm32-uart.h
ehci-sh.h
elm.h
mtd: devices: elm: check for device's presence before configuration
2013-04-05 12:57:18 +01:00
emif_plat.h
memory: emif: Handle devices which are not rated for >85C
2013-03-25 13:18:12 -07:00
eth-netx.h
ARM: netx: move platform_data definitions
2012-09-14 11:17:36 +02:00
exynos_thermal.h
Thermal: exynos: Add support for temperature falling interrupt.
2013-02-08 20:26:07 +08:00
fsa9480.h
gpio-em.h
gpio-omap.h
ARM: OMAP: Remove NEED_MACH_GPIO_H
2012-11-02 12:00:36 -07:00
gpio-rcar.h
gpio-rcar: Add pinctrl support
2013-04-03 10:30:34 +09:00
gpio-ts5500.h
gpio: add TS-5500 DIO blocks support
2012-12-10 11:23:25 +01:00
hwmon-s3c.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
i2c-cbus-gpio.h
i2c: i2c-cbus-gpio: introduce driver
2012-11-19 09:57:16 +01:00
i2c-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
i2c-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
i2c-nomadik.h
i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
2012-10-06 13:20:33 +02:00
i2c-nuc900.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
i2c-s3c2410.h
ARM: s3c: i2c: add platform_device forward declaration
2013-02-14 15:04:40 +01:00
ina2xx.h
hwmon: INA219 and INA226 support
2012-05-22 06:48:02 -07:00
invensense_mpu6050.h
Invensense MPU6050 Device Driver.
2013-02-10 17:42:43 +00:00
iommu-omap.h
iommu/omap: Adapt to runtime pm
2012-12-03 18:48:23 +01:00
irda-pxaficp.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
irq-renesas-intc-irqpin.h
irqchip: intc-irqpin: GPL header for platform data
2013-03-18 21:26:06 +09:00
irq-renesas-irqc.h
irqchip: Renesas IRQC driver
2013-03-18 21:26:06 +09:00
keyboard-pxa930_rotary.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
keyboard-spear.h
ARM: spear: move platform_data definitions
2012-09-19 17:42:19 +02:00
keypad-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
keypad-nomadik-ske.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
keypad-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
keypad-pxa27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
keypad-w90p910.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
keyscan-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
lcd-mipid.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
leds-kirkwood-netxbig.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
leds-kirkwood-ns2.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
leds-lm355x.h
leds: Add new LED driver for lm355x chips
2012-09-11 18:32:43 +08:00
leds-lm3642.h
leds: Add new LED driver for lm3642 chips
2012-09-13 11:56:41 +08:00
leds-lp55xx.h
leds: lp55xx: configure the clock detection
2013-04-01 11:04:53 -07:00
leds-omap.h
ARM: OMAP: Move plat/led.h to include/linux/platform_data
2012-10-17 12:03:18 -07:00
leds-pca9633.h
leds: add output driver configuration for pca9633 led driver
2012-09-24 19:12:29 +08:00
leds-renesas-tpu.h
leds-s3c24xx.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
lm3630_bl.h
backlight: add Backlight driver for lm3630 chip
2012-10-06 03:04:53 +09:00
lm3639_bl.h
backlight: add new lm3639 backlight driver
2012-10-06 03:04:53 +09:00
lp855x.h
backlight: lp855x: remove duplicate platform data
2013-04-29 18:28:19 -07:00
lp8727.h
lp8727_charger: More pure cosmetic improvements
2012-09-20 18:07:23 -07:00
lp8755.h
regulator: lp8755: new driver for LP8755
2012-12-24 16:32:34 +00:00
macb.h
net/at91_ether: add pdata flag for reverse Eth addr
2012-10-23 02:40:10 -04:00
max197.h
hwmon: add Maxim MAX197 support
2012-09-23 21:08:33 -07:00
max310x.h
serial: New serial driver MAX310X
2012-08-16 12:12:25 -07:00
max6697.h
hwmon: Driver for Maxim MAX6697 and compatibles
2013-02-06 09:57:56 -08:00
mfd-mcp-sa11x0.h
ARM: sa1100: move platform_data definitions
2012-09-14 11:18:57 +02:00
microread.h
NFC: Initial support for Inside Secure microread
2013-02-03 20:37:42 +01:00
mipi-csis.h
[media] s5p-csis: Allow to specify pixel clock's source through platform data
2012-10-05 22:35:16 -03:00
mmc-davinci.h
ARM: davinci: mmc: derive version information from device name
2013-04-03 09:42:16 +05:30
mmc-esdhc-imx.h
mmc: sdhci-esdhc-imx: support 8bit mode
2013-02-24 14:37:03 -05:00
mmc-msm_sdcc.h
ARM: msm: move platform_data definitions
2012-09-14 11:17:35 +02:00
mmc-mvsdio.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
mmc-mxcmmc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mmc-omap.h
ARM: arm-soc: Header cleanups
2012-12-12 11:45:16 -08:00
mmc-pxamci.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
mmc-s3cmci.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mmc-sdhci-s3c.h
mmc: sdhci-s3c: remove platform dependencies
2013-04-19 13:51:23 +02:00
mmp_audio.h
ASoC: mmp: add audio dma support
2012-06-13 13:13:37 +01:00
mmp_dma.h
dmaengine: mmp-pdma support
2012-09-14 08:14:07 +05:30
mouse-pxa930_trkball.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
msm_serial_hs.h
mtd-davinci-aemif.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mtd-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mtd-mxc_nand.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mtd-nand-omap2.h
mtd: omap-nand: pass device_node in platform data
2013-01-14 09:55:19 -08:00
mtd-nand-pxa3xx.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
mtd-nand-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mtd-onenand-omap2.h
mtd: omap-onenand: pass device_node in platform data
2013-02-01 14:10:11 -08:00
mtd-orion_nand.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
mv_usb.h
usb: mv_usb: remove clock name from pdata
2013-04-02 11:42:47 +03:00
ntc_thermistor.h
hwmon: Fix CamelCase checkpatch warnings
2013-04-07 21:16:40 -07:00
omap-abe-twl6040.h
omap-twl4030.h
ASoC: omap-twl4030: Update the header file to support more boards
2012-12-07 12:54:31 +09:00
omap-wd-timer.h
ARM: OMAP2+: WDT: move init; add read_reset_sources pdata function pointer
2012-10-29 20:49:44 -06:00
omap1_bl.h
ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
2012-09-10 16:34:00 -07:00
omap4-keypad.h
omap_drm.h
staging: drm/omap: add support for ARCH_MULTIPLATFORM
2012-10-30 11:10:00 -07:00
omap_ocp2scp.h
drivers: bus: ocp2scp: add pdata support
2012-11-07 09:35:53 -08:00
pcmcia-pxa2xx_viper.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
pinctrl-coh901.h
pinctrl/u300/coh901: stop spawning pinctrl from GPIO
2012-11-21 08:55:22 +01:00
pinctrl-nomadik.h
pinctrl/nomadik: merge old pincfg header
2012-11-05 09:55:29 +01:00
pn544.h
NFC: Move pn544.h to linux/platform_data/
2012-11-19 23:56:59 +01:00
pxa2xx_udc.h
ARM: move udc_pxa2xx.h to linux/platform_data
2012-11-16 11:35:30 +00:00
pxa_sdhci.h
mmc: sdhci-pxav3: add quirks2
2012-12-06 13:54:51 -05:00
remoteproc-omap.h
- Remoteproc Recovery - by Fernando Guzman Lugo - when a remote processor
2012-10-04 09:11:57 -07:00
s3c-hsotg.h
ARM defconfigs: add missing inclusions of linux/platform_device.h
2013-02-14 15:14:32 -08:00
s3c-hsudc.h
sa11x0-serial.h
ARM: move serial_sa1100.h header file to linux/platform_data
2012-11-16 11:35:29 +00:00
samsung-usbphy.h
usb: phy: samsung: Introducing usb phy driver for hsotg
2013-01-18 15:06:30 +02:00
sc18is602.h
spi: Master driver for NXP SC18IS602/603
2012-08-22 19:34:51 +01:00
serial-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
serial-omap.h
SERIAL: OMAP: Remove the slave idle handling from the driver
2013-05-19 16:37:08 -06:00
serial-sccnxp.h
serial: sccnxp: Replace pdata.init/exit with regulator API
2013-04-15 11:04:07 -07:00
sh_ipmmu.h
iommu/shmobile: Add iommu driver for Renesas IPMMU modules
2013-02-06 10:57:25 +01:00
shmob_drm.h
drm: Renesas SH Mobile DRM driver
2012-09-18 12:28:22 +02:00
sht15.h
hwmon: (sht15) move header to linux/platform_data/
2012-09-23 21:08:35 -07:00
si5351.h
clk: add si5351 i2c common clock driver
2013-04-12 11:04:38 -07:00
spi-clps711x.h
spi/clps711x: New SPI master driver
2012-12-05 23:14:38 +00:00
spi-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
spi-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
spi-imx.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
spi-nuc900.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
spi-omap2-mcspi.h
spi: spi-omap2-mcspi.c: Toggle CS after each word
2013-01-26 17:00:04 +08:00
spi-s3c64xx.h
spi: s3c64xx: move to generic dmaengine API
2013-04-12 13:54:58 +01:00
st1232_pdata.h
Input: st1232 - add reset pin handling
2013-04-15 10:00:44 -07:00
tegra_emc.h
tegra_usb.h
ti_am335x_adc.h
IIO : ADC: tiadc: Add support of TI's ADC driver
2012-11-05 23:50:27 +01:00
touchscreen-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
tsl2563.h
iio:light:tsl2563 move out of staging
2013-01-27 17:37:24 +00:00
uio_dmem_genirq.h
Add new uio device for dynamic memory allocation
2012-10-24 15:39:08 -07:00
uio_pruss.h
uio: uio_pruss: replace private SRAM API with genalloc
2012-10-27 16:28:32 +05:30
usb-davinci.h
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
usb-ehci-mxc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-ehci-orion.h
ARM: orion: move platform_data definitions
2012-09-19 17:42:17 +02:00
usb-ehci-s5p.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb-imx_udc.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-musb-ux500.h
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
usb-mx2.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
usb-ohci-exynos.h
ARM: EXYNOS: change the name of USB ohci header
2013-04-08 21:54:16 +09:00
usb-ohci-pxa27x.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
usb-ohci-s3c2410.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb-omap.h
mfd: omap-usb-host: override number of ports from platform data
2013-02-13 13:22:49 +02:00
usb-pxa3xx-ulpi.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
usb-s3c2410_udc.h
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
usb3503.h
usb: misc: usb3503: Add to select the ports to disable
2013-05-30 21:32:52 +09:00
ux500_wdt.h
watchdog: Add support for ux500_wdt watchdog
2013-02-14 00:22:53 +01:00
video-ep93xx.h
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
video-imxfb.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
video-msm_fb.h
ARM: msm: move platform_data definitions
2012-09-14 11:17:35 +02:00
video-mx3fb.h
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
video-nuc900fb.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
video-pxafb.h
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
video_s3c.h
video/s3c: move platform_data out of arch/arm
2013-04-11 14:49:20 +03:00
voltage-omap.h
ARM: omap: move platform_data definitions
2012-09-19 17:39:52 +02:00
wiznet.h