Arnd Bergmann dffd7e35a5 Merge branch 'cleanup/gpio-header-removal' into next/soc ... * cleanup/gpio-header-removal: ARM: delete old reference to ARM_GPIOLIB_COMPLEX ARM: kill CONFIG_NEED_MACH_GPIO_H ARM: mach-s5p: get rid of all <mach/gpio.h> headers ARM: s5p: cut the custom ARCH_NR_GPIOS definition This resolves a massive amount of conflicts between the mach/gpio.h removal and the s5p platform removal. Almost all changes are trivial, as both sides remove stuff. Conflicts: arch/arm/Kconfig arch/arm/mach-s5p64x0/common.c arch/arm/mach-s5p64x0/dev-audio.c arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h arch/arm/mach-s5p64x0/mach-smdk6440.c arch/arm/mach-s5p64x0/mach-smdk6450.c arch/arm/mach-s5p64x0/setup-fb-24bpp.c arch/arm/mach-s5p64x0/setup-i2c0.c arch/arm/mach-s5p64x0/setup-i2c1.c arch/arm/mach-s5p64x0/setup-sdhci-gpio.c arch/arm/mach-s5p64x0/setup-spi.c arch/arm/mach-s5pc100/dev-audio.c arch/arm/mach-s5pc100/include/mach/gpio-samsung.h arch/arm/mach-s5pc100/mach-smdkc100.c arch/arm/mach-s5pc100/setup-fb-24bpp.c arch/arm/mach-s5pc100/setup-i2c0.c arch/arm/mach-s5pc100/setup-i2c1.c arch/arm/mach-s5pc100/setup-ide.c arch/arm/mach-s5pc100/setup-keypad.c arch/arm/mach-s5pc100/setup-sdhci-gpio.c arch/arm/mach-s5pc100/setup-spi.c arch/arm/mach-s5pv210/dev-audio.c arch/arm/mach-s5pv210/include/mach/gpio-samsung.h arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c arch/arm/mach-s5pv210/mach-smdkv210.c arch/arm/mach-s5pv210/setup-fb-24bpp.c arch/arm/mach-s5pv210/setup-fimc.c arch/arm/mach-s5pv210/setup-i2c0.c arch/arm/mach-s5pv210/setup-i2c1.c arch/arm/mach-s5pv210/setup-i2c2.c arch/arm/mach-s5pv210/setup-ide.c arch/arm/mach-s5pv210/setup-keypad.c arch/arm/mach-s5pv210/setup-sdhci-gpio.c arch/arm/mach-s5pv210/setup-spi.c arch/arm/plat-samsung/Kconfig arch/arm/plat-samsung/s5p-irq-eint.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2014-07-26 18:00:40 +02:00
..
aoa	ALSA: sound/aoa/codecs/onyx.c: use static const for texts	2014-05-27 11:58:55 +02:00
arm	ASoC: pxa: remove mach header dependency	2014-05-20 23:14:49 +01:00
atmel	ALSA: sound/atmel/ac97c.c: Convert to module_platform_driver	2014-04-16 10:22:03 +02:00
core	ALSA: control: Make sure that id->index does not overflow	2014-06-18 15:13:37 +02:00
drivers	ALSA: drivers: Convert to snd_card_new() with a device pointer	2014-02-12 10:58:20 +01:00
firewire	ALSA: bebob: Remove unused function prototype	2014-06-04 14:38:16 +02:00
i2c	ALSA: cs8427: separate HW initialization	2014-04-03 14:59:48 +02:00
isa	ALSA: gus: remove checks for CONFIG_SND_DEBUG_ROM	2014-05-30 10:12:10 +02:00
mips	ALSA: au1x00: Use resource_size instead of computation	2014-05-28 17:50:57 +02:00
oss	sound: remove checks for CONFIG_BCM_CS4297A_CSWARM	2014-05-30 10:11:55 +02:00
parisc	ALSA: parisc: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:05 +01:00
pci	ALSA: hda - Fix broken PM due to incomplete i915 initialization	2014-07-15 15:19:43 +02:00
pcmcia	ALSA: pcmcia: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:06 +01:00
ppc	ALSA: ppc: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:06 +01:00
sh	ALSA: sh: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:07 +01:00
soc	Merge branch 'cleanup/gpio-header-removal' into next/soc	2014-07-26 18:00:40 +02:00
sparc	ALSA: sparc: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:07 +01:00
spi	ALSA: spi: Convert to snd_card_new() with a device pointer	2014-02-14 08:14:08 +01:00
synth	ALSA: synth: emux: soundfont.c: Cleaning up memory leak	2014-06-01 14:33:09 +02:00
usb	ALSA: usb-audio: Fix races at disconnection and PCM closing	2014-06-26 10:33:35 +02:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c	consolidate the reassignments of ->f_op in ->open() instances	2013-10-24 23:34:53 -04:00
sound_firmware.c