summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sa11x0-mcp-fixes' into fixesRussell King2012-01-268-86/+3
|\
| * Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp b...Russell King2012-01-207-20/+2
| * Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."Russell King2012-01-207-66/+1
* | ARM: 7288/1: mach-sa1100: add missing module_init() callLinus Walleij2012-01-231-0/+2
* | ARM: sa11x0: fix section mismatch in cpu-sa1100.cRussell King2012-01-191-1/+1
* | ARM: sa11x0: fix collie build errorRussell King2012-01-191-3/+2
* | Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"Russell King2012-01-191-20/+0
* | Revert "ARM: sa1100: clean up of the clock support"Russell King2012-01-191-66/+25
|/
* Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2012-01-161-1/+1
|\
| * ARM: sa11x0: assabet: fix build warningRussell King2012-01-161-1/+1
* | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-141-3/+0
|\ \
| * | GPIO: sa1100: implement proper gpiolib gpio_to_irq conversionRussell King2012-01-131-3/+0
* | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same...Linus Torvalds2012-01-138-3/+86
|\ \ \ | |_|/ |/| |
| * | ARM: sa1100: Refactor mcp-sa11x0 to use platform resources.Jochen Friedrich2012-01-097-1/+66
| * | ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.Jochen Friedrich2012-01-097-2/+20
| |/
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-111-6/+7
|\ \
| * | arm/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-6/+7
| |/
* | Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-0918-42/+29
|\ \
| * \ Merge branch 'restart' into for-linusRussell King2012-01-0516-13/+25
| |\ \
| | * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * | ARM: restart: sa1100: use new restart hookRussell King2012-01-0516-9/+25
| | * | Merge branch 'restart-cleanup' into restartRussell King2012-01-051-2/+2
| | |\ \ | | | |/
| * | | Merge branch 'devel-stable' into for-linusRussell King2012-01-053-30/+4
| |\ \ \
| | * | | ARM: 7269/1: mach-sa1100: fix sched_clock breakageLinus Walleij2012-01-051-1/+1
| | * | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-25/+3
| | * | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-4/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-4/+0
| | * | | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
| | |/ /
| * | | ARM: mach-sa1100: fix implicit use of page.hBjorn Helgaas2012-01-031-0/+1
| | |/ | |/|
* | | ARM: sa1100: clean up of the clock supportJett.Zhou2011-12-281-25/+66
* | | RTC: sa1100: support sa1100, pxa and mmp soc familiesJett.Zhou2011-12-281-0/+20
|/ /
* | ARM: sa1100: fix build errorJett.Zhou2011-12-081-2/+2
|/
* arm: fix implicit use of page.h in several arch/arm filesPaul Gortmaker2011-10-312-0/+2
* Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2811-11/+11
|\
| * ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| * ARM: mach-sa1100: convert boot_params to atag_offsetNicolas Pitre2011-08-2110-10/+10
* | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-274-69/+4
|\ \
| * | ARM: 7050/1: mach-sa1100: delete irq_to_gpio() functionLinus Walleij2011-08-221-2/+0
| * | ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystemLinus Walleij2011-08-222-65/+1
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-0/+2
| * | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-082-3/+2
* | | Merge branch 'misc' into for-linusRussell King2011-10-258-156/+263
|\ \ \
| * | | ARM: platform fixups: remove mdesc argument to fixup functionRussell King2011-10-171-2/+1
| * | | ARM: 7026/1: simpad: replace ARM specific LED codeJochen Friedrich2011-10-175-101/+28
| * | | ARM: 7025/1: simpad: add GPIO based device definitions.Jochen Friedrich2011-10-171-1/+66
| * | | ARM: 7024/1: simpad: Cleanup CS3 accessors.Jochen Friedrich2011-10-173-52/+153
| * | | ARM: 7027/1: simpad: Add ucb1x00 GPIO definitions and register GPIOJochen Friedrich2011-10-172-0/+14
| * | | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-2/+3
| | |/ | |/|
| | |
| \ \
*-. \ \ Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v...Russell King2011-10-251-4/+2
|\ \ \ \ | |_|/ / |/| | / | | |/
| * | ARM: io: remove IO_SPACE_LIMIT from SA11x0Russell King2011-08-171-4/+2
| |/
OpenPOWER on IntegriCloud