linux/arch/arm
Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 22:44:18 +01:00
..
boot arm/dt: Tegra: Add support-8bit to SDHCI nodes 2011-09-22 14:44:28 +00:00
common ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
configs ARM: at91: add defconfig for at91sam9g45 family 2011-10-07 17:40:01 +02:00
include/asm Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
kernel ARM: fix vmlinux.lds.S discarding sections 2011-09-20 23:42:31 +01:00
lib arm: remove "optimized" SHA1 routines 2011-08-07 14:07:03 -07:00
mach-at91 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-bcmring Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-clps711x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-cns3xxx ARM: cns3xxx: Fix newly introduced warnings in the PCIe code 2011-09-09 23:33:34 +04:00
mach-davinci Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-dove ARM: Dove: fix second SPI initialization call 2011-09-14 14:31:43 +02:00
mach-ebsa110 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ep93xx Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-exynos4 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-footbridge Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-08-29 16:34:07 -07:00
mach-gemini ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-h720x Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
mach-imx Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-integrator mach-integrator: fix VGA base regression 2011-09-20 22:58:41 +02:00
mach-iop13xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-iop32x Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-iop33x Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ixp4xx ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-ixp23xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-ixp2000 ARM: 7043/1: mach-ixp2000: rename GPIO header 2011-08-22 09:13:21 +01:00
mach-kirkwood ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mach-ks8695 ARM: 7037/1: mach-ks8695: fix GPIO LEDs 2011-08-22 09:12:55 +01:00
mach-l7200/include/mach
mach-lpc32xx ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics 2011-08-22 09:13:21 +01:00
mach-mmp Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-msm ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-mv78xx0 ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mach-mx5 ARM: mx5: fix clock usage for suspend 2011-10-08 21:43:06 +02:00
mach-mxs Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-netx ARM: 6827/1: mach-netx: delete hardcoded periphid 2011-05-26 10:33:34 +01:00
mach-nomadik ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> 2011-08-23 15:30:04 +01:00
mach-nuc93x Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
mach-omap1 ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mach-omap2 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-orion5x Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-pnx4008 ARM: 7057/1: mach-pnx4008: rename GPIO header 2011-08-23 15:30:04 +01:00
mach-prima2 ARM: CSR: add missing sentinels to of_device_id tables 2011-09-11 09:11:26 +08:00
mach-pxa Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-realview Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-rpc ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
mach-s3c64xx Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-s3c2400/include/mach ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
mach-s3c2410 ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-s3c2412 Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:43:28 -07:00
mach-s3c2416 Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-s3c2440 atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mach-s3c2443 ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv 2011-09-26 10:30:29 +09:00
mach-s5p64x0 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-s5pc100 ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-s5pv210 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-sa1100 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-shark Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
mach-shmobile Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-spear3xx ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-spear6xx ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
mach-tcc8k clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
mach-tegra ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> 2011-09-27 00:20:53 +01:00
mach-u300 ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
mach-ux500 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
mach-versatile ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-vexpress ARM: 7003/1: vexpress: Add clock definition for the SP805. 2011-08-24 09:45:21 +01:00
mach-vt8500 ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-w90x900 ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
mach-zynq ARM: zynq: remove incorrectly deleted file 2011-07-28 16:02:53 +00:00
mm ARM: dma-mapping: free allocated page if unable to map 2011-09-26 09:36:50 +01:00
nwfpe
oprofile Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-02-15 10:18:48 -08:00
plat-iop ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
plat-mxc Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
plat-nomadik ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> 2011-08-23 15:30:04 +01:00
plat-omap Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
plat-orion ARM: 7063/1: Orion: gpio: add missing include of linux/types.h 2011-08-24 08:29:20 +01:00
plat-pxa Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
plat-s3c24xx Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:43:28 -07:00
plat-s5p ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt 2011-09-26 13:17:41 +09:00
plat-samsung ARM: SAMSUNG: fix to prevent declaring duplicated 2011-09-15 15:54:15 +09:00
plat-spear ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
plat-tcc ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
plat-versatile ARM: consolidate SMP cross call implementation 2011-05-23 16:53:17 +01:00
tools ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
vfp Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
Kconfig Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
Kconfig-nommu Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig.debug lib: consolidate DEBUG_STACK_USAGE option 2011-05-25 08:39:54 -07:00
Makefile Merge branch 'imx/dt' into next/dt 2011-07-28 15:25:46 +00:00