summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-061-0/+1
|\
| * arm: Add export.h to ARM specific files as required.Paul Gortmaker2011-10-311-0/+1
* | Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-052-1/+2
|\ \
| * \ Merge branch 'pxa/devel' into next/devel2Arnd Bergmann2011-10-301-0/+2
| |\ \
| * | | ARM: S3C2416: Add armdiv_mask constantHeiko Stuebner2011-10-141-0/+1
| * | | ARM: S3C2410: fix S3C_GPIO_SPACE #error message to match realityPeter Korsgaard2011-10-121-1/+1
* | | | Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-0511-184/+16
|\ \ \ \
| * \ \ \ Merge branch 'depends/rmk/memory_h' into next/cleanup2Arnd Bergmann2011-11-0111-27/+11
| |\ \ \ \
| * | | | | ARM: SAMSUNG: Cleanup resources by using macroKukjin Kim2011-10-062-2/+3
| * | | | | ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.cKukjin Kim2011-10-062-74/+2
| | |/ / / | |/| | |
| * | | | Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2Kukjin Kim2011-10-041-3/+3
| |\ \ \ \
| | * | | | ARM: SAMSUNG: Consolidate plat/pll.hKukjin Kim2011-10-041-3/+3
| * | | | | Merge branch 'next-samsung-devel' into next-samsung-devel-2Kukjin Kim2011-10-047-112/+21
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ARM: S3C2443: Define constant for HSSPI pclkHeiko Stuebner2011-10-041-0/+1
| | * | | | Merge branch 'next/topic-gpio-samsung' into next-samsung-develKukjin Kim2011-10-046-112/+7
| | |\ \ \ \
| | | * | | | ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGsKukjin Kim2011-09-211-1/+0
| | | * | | | ARM: SAMSUNG: Update the name of regarding Samsung GPIOKukjin Kim2011-09-214-104/+7
| | | * | | | gpio/s3c24xx: move gpio driver into drivers/gpio/Kukjin Kim2011-09-212-7/+0
* | | | | | | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2011-11-041-7/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | ARM: SAMSUNG: Remove Samsung specific enum type for dma directionBoojin Kim2011-09-141-1/+1
| * | | | | | ASoC: Samsung: Update DMA interfaceBoojin Kim2011-09-141-5/+5
| * | | | | | ARM: SAMSUNG: Add common DMA operationsBoojin Kim2011-09-141-1/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-015-99/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-314-24/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-3111-27/+11
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-089-10/+10
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'next/topic-plat-samsung-1' into next-samsung-cleanupKukjin Kim2011-09-171-6/+46
| |\ \ \ \ \ \
| | * | | | | | ARM: SAMSUNG: Move map header file into plat-samsungKukjin Kim2011-09-161-6/+46
| | | |_|_|/ / | | |/| | | |
| * | | | | | ARM: S3C24XX: remove unused gpio codesKukjin Kim2011-09-163-79/+0
| * | | | | | ARM: S3C24XX: Remove hw_addr from s3c24xx dma channel declarationsHeiko Stuebner2011-09-161-14/+0
| |/ / / / /
* | | | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2811-27/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | ARM: mach-s3c2410: remove memory.hNicolas Pitre2011-10-131-16/+0
| * | | | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| | |/ / / | |/| | |
| * | | | ARM: mach-s3c24*: convert boot_params to atag_offsetNicolas Pitre2011-08-219-10/+10
| |/ / /
* | | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-272-7/+1
|\ \ \ \ | | |/ / | |/| |
| * | | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-2/+0
| * | | ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-1/+0
| * | | ARM: gpio: consolidate trivial gpiolib implementationsRussell King2011-08-121-4/+1
| * | | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-081-1/+1
| |/ /
* | | Merge branch 'misc' into for-linusRussell King2011-10-251-2/+2
|\ \ \
| * | | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-2/+2
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v...Russell King2011-10-251-2/+0
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * ARM: io: s3c2410: remove ioaddr()Russell King2011-08-171-2/+0
| |/
* / ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PMDomenico Andreoli2011-10-221-0/+2
|/
* Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-261-0/+3
|\
| * ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio controlBen Dooks2011-07-201-0/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-251-1/+0
|\ \
| * | Merge branch 'master' into for-nextJiri Kosina2011-07-112-35/+0
| |\|
| * | treewide: remove duplicate includesVitaliy Ivanov2011-06-201-1/+0
* | | Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-253-275/+0
|\ \ \