summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-osiris.c
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-211-16/+13Star
|\
| * Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson2013-02-061-1/+1
| |\
| | * ARM: S3C24XX: header mach/regs-mem.h localKukjin Kim2013-02-041-1/+1
| * | Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kern...Olof Johansson2013-02-051-15/+12Star
| |\|
| | * ARM: S3C24XX: make osiris-cpld.h and osiris-map.h localKukjin Kim2013-01-101-15/+12Star
| * | ARM: delete struct sys_timerStephen Warren2012-12-241-1/+1
| |/
* / ARM: S3C24XX: add missing platform_device.h include for osirisHeiko Stuebner2013-02-081-0/+1
|/
* Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-221-2/+2
|\
| * ARM: samsung: move platform_data definitionsArnd Bergmann2012-09-191-2/+2
* | ARM: S3C24XX: Convert users of s3c2410_gpio_setpin to gpiolib APISylwester Nawrocki2012-08-281-3/+4
|/
* ARM: S3C24XX: Use common macro to define resources on mach-osiris.cTushar Behera2012-05-121-10/+2Star
* Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 in...Arnd Bergmann2012-03-151-1/+1
* ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/Kukjin Kim2012-03-031-0/+440