Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm
History
Russell King f779b7dd32 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 
Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
2010-10-19 20:12:24 +01:00
..
boot ARM: Fix build error when using KCONFIG_CONFIG 2010-09-19 16:18:37 +01:00
common Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable 2010-10-08 10:06:58 +01:00
configs Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
include/asm ARM: add a vma entry for the user accessible vector page 2010-10-01 22:35:19 -04:00
kernel Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
lib
mach-aaec2000 ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-at91 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
mach-bcmring ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-clps711x ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-cns3xxx
mach-davinci ARM: 6409/1: davinci: map sram using MT_MEMORY_NONCACHED instead of MT_DEVICE 2010-09-25 15:58:40 +01:00
mach-dove ARM: dove: fix __io() definition to use bus based offset 2010-09-19 22:43:42 -04:00
mach-ebsa110 ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-ep93xx ARM: 6440/1: ep93xx: DMA: fix channel_disable 2010-10-12 22:43:19 +01:00
mach-footbridge ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-gemini
mach-h720x ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-imx Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
mach-integrator ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices" 2010-09-22 17:22:38 -07:00
mach-ixp23xx ARM: 6283/1: Remove useless PCIO_BASE definitions 2010-08-05 10:35:49 +01:00
mach-ixp2000
mach-kirkwood [ARM] Kirkwood: add LED support for netxbig_v2 boards 2010-10-07 14:13:23 -04:00
mach-ks8695
mach-lh7a40x
mach-loki
mach-lpc32xx
mach-mmp ARM: mmp: update cpuid of pxa168 and pxa910 2010-10-09 17:07:32 +08:00
mach-msm Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable 2010-10-19 19:55:59 +01:00
mach-mv78xx0
mach-mx3 MX35: Fix bogus L2 cache settings 2010-10-11 15:31:39 +02:00
mach-mx5 Merge branch 'for-rmk-next' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable 2010-10-11 17:30:44 +01:00
mach-mx25 mx25/clocks: match esdhc-clocks to platform device 2010-10-11 15:31:41 +02:00
mach-mxc91231
mach-netx ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1 ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-omap2 ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-orion5x ARM: Fix gen_nand probe structures contents 2010-08-12 02:21:18 +01:00
mach-pnx4008 ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-pxa ARM: pxa/balloon3: Disperse MFP config 2010-10-09 17:10:40 +08:00
mach-realview
mach-rpc ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-s3c24a0/include/mach
mach-s3c64xx ARM: S3C64XX: Add IORESOURCE_IRQ_HIGHLEVEL flag to dm9000 on mach-real6410 2010-09-18 09:54:55 +09:00
mach-s3c2400
mach-s3c2410 ARM: SAMSUNG: Fix on build warning regarding VMALLOC_END type 2010-08-27 15:28:38 +09:00
mach-s3c2412
mach-s3c2416 s3c-fb: add device name initialization 2010-08-11 08:59:10 -07:00
mach-s3c2440 panic: keep blinking in spite of long spin timer mode 2010-08-11 08:59:22 -07:00
mach-s3c2443 s3c-fb: add device name initialization 2010-08-11 08:59:10 -07:00
mach-s5p64x0 ARM: S5P64X0: Bug fix on errors of build with CONFIG_PREEMPT_NONE 2010-10-18 18:33:04 +09:00
mach-s5p6442 ARM: S5P: Moves initial map for merging S5P64X0 2010-10-18 10:33:34 +09:00
mach-s5pc100 ARM: S5P: Moves initial map for merging S5P64X0 2010-10-18 10:33:34 +09:00
mach-s5pv210 ARM: S5P: Moves initial map for merging S5P64X0 2010-10-18 10:33:34 +09:00
mach-s5pv310 ARM: S5PV310: Fix build error on GPIO map 2010-10-19 08:02:57 +09:00
mach-sa1100 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
mach-shark ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-shmobile ARM: mach-shmobile: ap4evb: fix write protect for SDHI1 2010-08-20 20:41:23 +09:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-tcc8k ARM: Add board support for Telechips TCC8000-SDK board 2010-09-17 21:55:09 +02:00
mach-tegra arm: tegra: VMALLOC_END should be unsigned long 2010-08-22 12:54:23 -07:00
mach-u300 ARM: 6377/1: supply _cansleep gpio function to U300 2010-09-17 10:16:49 +01:00
mach-ux500 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-08-09 21:00:07 -07:00
mach-versatile ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00
mach-vexpress ARM: fix section mismatch warnings in Versatile Express 2010-10-05 11:30:40 +01:00
mach-w90x900 i2c/nuc900: add i2c driver support for nuc900 2010-08-11 00:34:38 +01:00
mm Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
nwfpe
oprofile oprofile, ARM: Release resources on failure 2010-09-30 09:14:25 +02:00
plat-iop
plat-mxc ARM: iomux-mx51: Add AUD5 pinmux definitions 2010-10-11 15:32:54 +02:00
plat-nomadik ARM: 6376/1: plat-nomadik: MTU: Change prescaler limit and comment updates 2010-09-17 10:16:48 +01:00
plat-omap omap: iommu-load cam register before flushing the entry 2010-10-05 10:22:13 -07:00
plat-orion Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-08-07 17:07:31 -07:00
plat-pxa ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts 2010-10-09 17:07:19 +08:00
plat-s3c24xx
plat-s5p ARM: S5P64X0: Add UART serial support for S5P6450 2010-10-18 18:33:04 +09:00
plat-samsung ARM: S5P64X0: Replace the 6440 system device class definition with 64x0 2010-10-18 18:33:04 +09:00
plat-spear Merge branch 'master' into for-next 2010-08-04 15:14:38 +02:00
plat-stmp3xxx
plat-tcc ARM: Basic IO mappings for mach-tcc8k 2010-09-17 21:55:08 +02:00
plat-versatile
tools ARM: Update mach-types 2010-09-09 22:49:26 +01:00
vfp
Kconfig Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00
Kconfig-nommu
Kconfig.debug ARM: implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem 2010-10-01 22:31:34 -04:00
Makefile Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00