Linus Torvalds ca90666287 Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ...

* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

2011-10-27 08:39:10 +02:00

..

include/mach

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-27 08:39:10 +02:00

clock.c

ARM: S3C64XX: Add clkdev support

2011-07-20 19:11:30 +09:00

cpu.c

ARM: S3C64XX: Merge s3c6400-init.c into cpu.c

2010-02-20 22:34:01 +00:00

dev-audio.c

ASoC: Samsung: Rename AC97 platform device

2010-11-23 14:05:29 +00:00

dev-onenand1.c

ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND

2011-07-21 02:11:21 +09:00

dev-spi.c

ARM: SAMSUNG: Add tx_st_done variable

2011-07-06 15:03:08 +09:00

dev-uart.c

ARM: SAMSUNG: Remove uart irq handling from plaform code

2011-08-23 10:48:31 -07:00

dma.c

ARM: SAMSUNG: DMA Cleanup as per sparse

2011-07-16 15:50:19 +09:00

gpiolib.c

ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions

2011-03-04 15:46:26 +09:00

irq-eint.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

irq-pm.c

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

irq.c

ARM: SAMSUNG: Remove uart irq handling from plaform code

2011-08-23 10:48:31 -07:00

Kconfig

Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:13:04 -07:00

mach-anw6410.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-crag6410.c

ASoC: Rename WM8915 to WM8996

2011-08-08 14:30:37 +09:00

mach-hmt.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-mini6410.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-ncp.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-real6410.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-smartq5.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-smartq7.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

mach-smartq.c

ARM: 6351/1: s3c64xx: don't put smartq_bl_init in .init.text

2010-09-02 16:36:07 +01:00

mach-smartq.h

ARM: S3C6410: Add basic support for SmartQ machines

2010-05-20 19:42:15 +09:00

mach-smdk6400.c

arm: remove machine_desc.io_pg_offst and .phys_io

2010-10-20 00:27:46 -04:00

mach-smdk6410.c

ARM: S3C64XX: Remove un-used code backlight code on SMDK6410

2011-09-15 13:59:58 +09:00

Makefile

Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:13:04 -07:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

pm.c

ARM: S3C64XX: Fix build break in PM debug

2011-08-19 20:57:36 +09:00

s3c6400.c

ARM: SAMSUNG: Add platform support code for OneNAND controller

2010-05-20 17:48:36 +09:00

s3c6410.c

ARM: SAMSUNG: Implement set_name function for ADC devices

2010-08-05 18:32:50 +09:00

setup-fb-24bpp.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

setup-i2c0.c

ARM: S3C64XX: Remove gpio-bank-X header files

2011-05-06 09:37:36 +09:00

setup-i2c1.c

ARM: S3C64XX: Remove gpio-bank-X header files

2011-05-06 09:37:36 +09:00

setup-ide.c

ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped

2010-10-25 16:04:33 +09:00

setup-keypad.c

ARM: S3C64XX: Fix keypad setup to configure correct number of rows

2011-03-04 15:46:26 +09:00

setup-sdhci-gpio.c

ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:51:37 +09:00

setup-sdhci.c

ARM: S3C64XX: Tone down SDHCI debugging

2011-03-04 15:46:27 +09:00

sleep.S

ARM: pm: samsung: move cpu_suspend into C code

2011-06-24 08:48:44 +01:00