sugar/linux
1
0
Fork 0
Code Activity
Files
3e965b176341b78620f7404fd8b7f9a0d061f8a2
linux/arch/arm
History
Arnd Bergmann 3e965b1763 Merge branch 'next/fixes' into next/cleanup 
Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c
2011-10-31 23:25:41 +01:00
..
boot
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
common
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
configs
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
include/asm
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
kernel
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
lib
arm: remove "optimized" SHA1 routines
2011-08-07 14:07:03 -07:00
mach-at91
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-bcmring
ARM: mach-bcmring: remove mach/memory.h
2011-10-13 12:49:48 -04:00
mach-clps711x
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-cns3xxx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-davinci
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-dove
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-ebsa110
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-ep93xx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-exynos4
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-footbridge
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-gemini
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-h720x
ARM: mach-h720x: remove mach/memory.h
2011-10-13 12:49:45 -04:00
mach-imx
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-integrator
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-iop13xx
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-iop32x
ARM: mach-iop32x: remove mach/memory.h
2011-10-13 12:49:32 -04:00
mach-iop33x
ARM: mach-iop33x: remove mach/memory.h
2011-09-26 10:12:04 -04:00
mach-ixp4xx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-ixp23xx
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-ixp2000
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-kirkwood
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-ks8695
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-l7200/include/mach
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-lpc32xx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-mmp
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-msm
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-mv78xx0
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-mx5
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-mxs
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-netx
ARM: mach-netx: remove mach/memory.h
2011-10-13 12:49:35 -04:00
mach-nomadik
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-nuc93x
ARM: mach-nuc93x: remove mach/memory.h
2011-10-13 12:49:40 -04:00
mach-omap1
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-omap2
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-orion5x
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-pnx4008
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-prima2
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-pxa
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-realview
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-rpc
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-s3c64xx
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-s3c2410
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-s3c2412
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2416
ARM: mach-s3c24*: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c2440
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2443
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-s5p64x0
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-s5pc100
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-s5pv210
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-sa1100
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-shark
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-shmobile
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-spear3xx
ARM: spear: remove mach/memory.h and plat/memory.h
2011-10-13 12:49:38 -04:00
mach-spear6xx
ARM: spear: remove mach/memory.h and plat/memory.h
2011-10-13 12:49:38 -04:00
mach-tcc8k
ARM: mach-tcc8k: convert boot_params to atag_offset
2011-08-21 17:15:15 -04:00
mach-tegra
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-u300
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-ux500
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
mach-versatile
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-vexpress
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-vt8500
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-w90x900
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
mach-zynq
ARM: mach-zynq: remove mach/memory.h
2011-10-13 12:49:49 -04:00
mm
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
nwfpe
…
oprofile
…
plat-iop
…
plat-mxc
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
plat-nomadik
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
plat-omap
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +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
ARM: SAMSUNG: Move map header file into plat-samsung
2011-09-16 20:20:33 +09:00
plat-s5p
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
plat-samsung
Merge branch 'sirf/cleanup' into next/cleanup
2011-10-07 23:07:41 +02:00
plat-spear
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-10-31 23:11:53 +01:00
plat-tcc
ARM: plat-tcc: remove mach/memory.h
2011-10-13 12:49:42 -04:00
plat-versatile
…
tools
ARM: 7051/1: cpuimx* boards: fix mach-types errors
2011-08-22 15:57:22 +01:00
vfp
ARM: vfp: Fix the comment to make it consistent with the code.
2011-09-23 12:05:30 +05:30
Kconfig
Merge branch 'next/fixes' into next/cleanup
2011-10-31 23:25:41 +01:00
Kconfig-nommu
…
Kconfig.debug
ARM: kprobes: Add config option for selecting the ARM kprobes tests
2011-09-20 18:17:42 +00:00
Makefile
ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs
2011-08-13 11:26:18 +01:00