linux/arm at 45c79433c02b8fe7b8a1cbf60548a9798d0502ed - linux - Gitea: Git with a cup of tea

FEX-Emu/linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 19:43:29 +00:00

History

Ben Dooks 45c79433c0 ARM: S5PC100: Fixup merge problems

Between problems with Kconfig and merging commits from several
different sources, it seems the s5pc100 build's move from plat-s5pc11
has had a few problems.

Since I do not have the trees to rebuild this quickly, the easiest
thing is to simply fix the errors found once the s5pc100_defconfig
actually builds.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

2010-05-23 16:27:04 +01:00

..

ARM: 6031/1: fix Thumb-2 decompressor

2010-04-07 21:11:29 +01:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2010-04-29 17:17:35 -07:00

ARM: fix build error in arch/arm/kernel/process.c

2010-04-21 08:45:21 +01:00

ARM: fix build error in arch/arm/kernel/process.c

2010-04-21 08:45:21 +01:00

ARM: fix build error in arch/arm/kernel/process.c

2010-04-21 08:45:21 +01:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ARM: 5974/1: arm/mach-at91 Makefile: remove two blanks.

2010-04-14 11:22:44 +01:00

ARM: 6024/1: bcmring: fix missing down on semaphore in dma.c

2010-04-07 21:11:27 +01:00

…

Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

2010-04-07 11:03:06 -07:00

…

…

ARM: 6029/1: ep93xx: gpio.c: local functions should be static

2010-04-07 21:11:28 +01:00

mach-footbridge

…

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mach-integrator

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

…

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

…

[ARM] mmp: fix for variables in uncompress.h being discarded

2010-03-22 12:03:05 +08:00

…

…

…

…

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

2010-04-08 10:47:05 +01:00

i.MX51: remove NFC AXI static mapping

2010-03-19 11:18:27 +01:00

…

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

…

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-04-27 08:27:26 -07:00

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-04-27 08:27:26 -07:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB

2010-04-28 22:21:52 +01:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mach-s3c24a0/include/mach

…

ARM: S3C64XX: PM: Synchronise wakeup mask on suspend

2010-05-20 21:07:08 +09:00

…

ARM: SAMSUNG: Move WDT device definitions in plat-samsung

2010-05-20 19:44:18 +09:00

ARM: Merge for-2635/fb-updates1

2010-05-19 18:04:11 +09:00

ARM: SMDK2416: Add support for framebuffer device and ensure correct setup

2010-05-18 18:46:30 +09:00

ARM: Merge for-2635/gpio2

2010-05-19 18:04:08 +09:00

ARM: Merge for-2635/fb-updates1

2010-05-19 18:04:11 +09:00

ARM: S5P6440: Add locking to GPIO calls

2010-05-20 21:05:40 +09:00

ARM: S5P6442: Define SPI platform devices

2010-05-20 19:34:01 +09:00

ARM: S5PC100: Fixup merge problems

2010-05-23 16:27:04 +01:00

ARM: S5PV210: Add temporary <mach/regs-fb.h>

2010-05-20 20:58:18 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

…

ARM: mach-shmobile: ap4evb SDHI0 platform data V2

2010-03-15 12:06:47 +09:00

…

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ARM: RX1950: Add suspend/resume support for RX1950

2010-05-12 09:19:54 +09:00

ARM: fix build error in arch/arm/kernel/process.c

2010-04-21 08:45:21 +01:00

…

…

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

2010-04-08 10:47:05 +01:00

…

musb: fix power field to hold all possible values

2010-04-30 09:25:07 -07:00

…

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ARM: SAMSUNG: Move WDT device definitions in plat-samsung

2010-05-20 19:44:18 +09:00

ARM: SAMSUNG: Fixup merge problem

2010-05-20 20:49:25 +09:00

ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not present

2010-05-23 16:26:04 +01:00

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ARM: Update mach-types

2010-03-20 15:37:39 +00:00

ARM: 6050/1: VFP: fix the SMP versions of vfp_{sync,flush}_hwstate

2010-04-14 11:11:30 +01:00

Kconfig

ARM: SAMSUNG: Fixup convert arm to arch_gettimeoffset()

2010-05-20 20:48:28 +09:00

Kconfig-nommu

…

Kconfig.debug

…

Makefile

ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework

2010-05-20 15:28:32 +09:00