summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx (follow)
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', '...Russell King2011-03-177-74/+27
|\ \
| | * ARM: S3C64XX: Update regulator names for debugfs compatiblity on SMDK6410Mark Brown2011-03-041-6/+6
| | * ARM: S3C64XX: Fix build with WM1190 disabled and WM1192 enabled on SMDK6410Mark Brown2011-03-041-0/+1
| | * ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()Ben Dooks2011-03-041-5/+6
| | * ARM: S3C64XX: Tone down SDHCI debuggingMark Brown2011-03-041-1/+1
| | * ARM: S3C64XX: Add clock for i2c1Ben Dooks2011-03-041-0/+6
| | * ARM: S3C64XX: Staticise non-exported GPIO to interrupt functionsMark Brown2011-03-041-2/+2
| | * ARM: S3C64XX: Fix keypad setup to configure correct number of rowsBen Dooks2011-03-041-1/+1
| |/ |/|
| * ARM: pm: convert samsung platforms to generic suspend/resume supportRussell King2011-02-221-59/+4
|/
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-153-34/+23
|\
| * Merge branch 'dev/cleanup-clocks' into for-nextKukjin Kim2011-01-051-16/+3
| |\
| | * ARM: S3C64XX: Tidy register and disable clock usageKukjin Kim2011-01-041-16/+3
| * | Merge branch 'next-s3c64xx' into for-nextKukjin Kim2011-01-031-0/+1
| |\ \
| | * | ARM: S3C64XX: Clear DMA_HALT upon startJassi Brar2011-01-031-0/+1
| | |/
| * | Merge branch 'next-samsung' into for-next-newKukjin Kim2010-12-301-18/+19
| |\ \
| | * | ARM: S3C64XX: Use chip_data to store the shift for EINTsMark Brown2010-12-301-4/+5
| | * | ARM: S3C64XX: Convert S3C64xx irq-eint to use new irq_ methodsMark Brown2010-12-301-16/+16
| | * | ARM: SAMSUNG: Convert s3c_irqext_wake() to new irq_ interrupt methodsMark Brown2010-12-301-1/+1
| | |/
| * | Merge branch 'next-samsung-asoc' into next-samsung-asoc2Kukjin Kim2010-12-222-27/+35
| |\ \ | | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2011-01-133-42/+37
|\ \ \
| * | | Merge branch 'topic/workq-update' into topic/asocTakashi Iwai2010-12-132-2/+2
| |\| |
| * | | ASoC: Samsung: Rename AC97 platform deviceJassi Brar2010-11-231-1/+1
| * | | ARM: Samsung: Define common audio-dma deviceJassi Brar2010-11-232-14/+1
| * | | ASoC: Samsung: Rename DMA deviceJassi Brar2010-11-231-1/+1
| | |/ | |/|
| * | ARM: S3C64XX: Upgrade platform device for I2SJassi Brar2010-11-192-25/+33
| * | ARM: SAMSUNG: Rename s3c64xx I2S platform deviceJassi Brar2010-11-191-3/+3
* | | Merge branch 'master' into for-nextJiri Kosina2010-12-223-3/+3
|\ \ \ | | |/ | |/|
| * | ARM: S3C64XX: fix uart clock setup for mini6410/real6410Darius Augulis2010-11-252-2/+2
| |/
| * ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warningsKyungmin Park2010-11-131-1/+1
* | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-011-1/+1
|/
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-3011-122/+609
|\
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2010-10-2811-122/+609
| |\
| | * ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() areaKukjin Kim2010-10-251-1/+1
| | * Merge branch 'next-s3c64xx' into for-nextKukjin Kim2010-10-254-5/+572
| | |\
| | | * ARM: S3C64XX: add touchscreen support for mach-mini6410Darius Augulis2010-10-212-0/+14
| | | * ARM: S3C64XX: add backlight control for mach-mini6410Darius Augulis2010-10-211-0/+21
| | | * ARM: S3C64XX: add frame buffer support for mach-mini6410Darius Augulis2010-10-212-0/+131
| | | * ARM: S3C64XX: add nand support for mach-mini6410Darius Augulis2010-10-212-0/+42
| | | * ARM: S3C64XX: add support for mach-mini6410Darius Augulis2010-10-213-0/+165
| | | * ARM: S3C64XX: add USB host support for mach-real6410Darius Augulis2010-10-192-0/+2
| | | * ARM: S3C64XX: add touchscreen support for mach-real6410Darius Augulis2010-10-192-0/+13
| | | * ARM: S3C64XX: add nand support for mach-real6410Darius Augulis2010-10-192-0/+41
| | | * ARM: S3C64XX: add frame buffer support for mach-real6410Darius Augulis2010-10-192-5/+143
| | * | ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototypedMark Brown2010-10-251-0/+1
| | * | ARM: S3C64XX: Ensure samsung_keypad_cfg_gpio() is prototypedMark Brown2010-10-251-0/+1
| | * | Merge branch 'next-gpio-update' into for-nextKukjin Kim2010-10-255-110/+33
| | |\ \
| | | * | ARM: S3C64XX: Fix special function for IISv4 portMark Brown2010-10-231-1/+1
| | | * | ARM: S3C64XX: 2nd Change to using s3c_gpio_cfgrange_nopull()Kukjin Kim2010-10-232-9/+4
| | | * | ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()Ben Dooks2010-10-231-8/+4
| | | * | ARM: S3C64XX: 2nd Change to using s3c_gpio_cfgall_range()Kukjin Kim2010-10-232-20/+7