summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds2014-04-052-14/+6
|\
| * Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux into ...Olof Johansson2014-02-182-14/+6
| |\
| | * ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, tooUwe Kleine-König2013-12-201-12/+0
| | * ARM: sa1100: stop using mach/timex.hUwe Kleine-König2013-12-201-2/+6
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst...Russell King2014-04-047-58/+64
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | | * | ARM: 7936/1: sa1100: collie: add support for IrDA transceiverDmitry Eremin-Solenikov2014-02-122-1/+34
| | | * | ARM: 7903/1: sa1100: h3xxx: drop hand-coded gpio_request_array analogueDmitry Eremin-Solenikov2014-02-122-42/+0
| | | * | ARM: 7902/1: sa1100: h3xxx: move serial port GPIO handling to common placeDmitry Eremin-Solenikov2014-02-123-14/+27
| | * | | ARM: 8000/1: misc: remove deprecated IRQF_DISABLEDMichael Opdenacker2014-03-121-1/+1
| |/ / / |/| | |
| * | | ARM: 7991/1: sa1100: fix compile problem on CollieLinus Walleij2014-03-071-0/+2
|/ / /
* | | Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-01-241-0/+7
|\ \ \
| * | | ARM: SA1100: Create dummy clk_get_rate() to avoid build failuresViresh Kumar2014-01-171-0/+7
| | |/ | |/|
* | | Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2014-01-231-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'soc/sched_clock' into next/socKevin Hilman2013-12-061-2/+2
| |\ \ | | |/ | |/|
| | * ARM: sa1100: Switch to sched_clock_register()Stephen Boyd2013-11-211-2/+2
* | | ARM: 7935/1: sa1100: collie: add gpio-keys configurationDmitry Eremin-Solenikov2014-01-111-0/+35
* | | ARM: 7901/1: sa1100: h3600: refactor IrDA GPIO handlingDmitry Eremin-Solenikov2013-12-121-19/+7
* | | ARM: 7900/1: sa1100: h3100: refactor IrDA GPIO handlingDmitry Eremin-Solenikov2013-12-121-2/+17
* | | ARM: 7899/1: sa1100: h3600: refactor LCD GPIO handlingDmitry Eremin-Solenikov2013-12-121-22/+26
* | | ARM: 7898/1: sa1100: h3100: refactor LCD GPIO handlingDmitry Eremin-Solenikov2013-12-121-8/+27
* | | ARM: sa11x0: assabet: clean up IrDA power settingRussell King2013-12-121-6/+3
* | | ARM: sa11x0: assabet: allow UCB1300 to wake up AssabetRussell King2013-12-121-0/+1
* | | ARM: sa11x0: assabet: better reset handlingRussell King2013-12-122-4/+137
|/ /
* | Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-11-142-67/+21
|\ \
| * | cpufreq: Implement light weight ->target_index() routineViresh Kumar2013-10-252-22/+0
| * | cpufreq: sa11x0: Fix build breakage after "Expose frequency table"Viresh Kumar2013-10-161-2/+1
| * | cpufreq: sa11x0: Use generic cpufreq routinesViresh Kumar2013-10-162-23/+0
| * | cpufreq: sa11x0: Expose frequency tableViresh Kumar2013-09-302-23/+23
| |/
| |
| \
*-. \ Merge branches 'fixes', 'mmci' and 'sa11x0' into for-nextRussell King2013-11-124-55/+6
|\ \ \ | |_|/ |/| |
| | * ARM: sa11x0/assabet: ensure CS2 is configured appropriatelyRussell King2013-10-291-0/+3
| | * ARM: 7841/1: sa1100: remove complex GPIO interfaceLinus Walleij2013-10-292-55/+2
| | * ARM: 7865/1: sa1100: fix simpad compilation warningLinus Walleij2013-10-291-0/+1
| |/
* / ARM: sa1100: collie.c: fall back to jedec_probe flash detectionAndrea Adami2013-09-181-1/+1
|/
* reboot: arm: change reboot_mode to use enum reboot_modeRobin Holt2013-07-092-3/+5
* sched_clock: Make ARM's sched_clock generic for all architecturesStephen Boyd2013-06-121-1/+1
* cpufreq: sa11x0: move cpufreq driver to drivers/cpufreqViresh Kumar2013-04-105-671/+14
* cpufreq: Notify all policy->cpus in cpufreq_notify_transition()Viresh Kumar2013-04-022-6/+4
* Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-2116-57/+46
|\
| * Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/li...Olof Johansson2013-02-051-1/+0
| |\
| | * ARM: remove unused arch_decomp_wdog()Shawn Guo2013-01-111-1/+0
| * | Merge branch 'clocksource/cleanup' into next/cleanupOlof Johansson2013-01-143-11/+7
| |\ \
| | * | ARM: use clockevents_config_and_register() where possibleShawn Guo2013-01-141-6/+2
| * | | ARM: delete struct sys_timerStephen Warren2012-12-2415-21/+15
| * | | ARM: sa1100: convert timer suspend/resume to clock_event_deviceStephen Warren2012-12-241-33/+33
| | |/ | |/|
* | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2013-02-211-3/+0
|\ \ \
| * | | ARM: sa1100: don't warn about mach/ide.hArnd Bergmann2013-02-141-3/+0
| | |/ | |/|
* / | ARM: sa1100/assabet: include platform_device.h directlyArnd Bergmann2013-02-141-0/+1
|/ /
* / ARM: drivers: remove __dev* attributes.Greg Kroah-Hartman2013-01-032-5/+5
|/
* ARM: move serial_sa1100.h header file to linux/platform_dataRussell King2012-11-1613-13/+13
* ARM: config: sort select statements alphanumericallyRussell King2012-10-131-6/+6