summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-01-171-0/+17
|\
| * mtd: nand: ams-delta: drop omap_read/write, use ioremapJanusz Krzysztofik2011-01-061-1/+12
| * mtd: nand: ams-delta: convert to platform driverJanusz Krzysztofik2011-01-061-0/+6
* | Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-153-39/+41
|\ \
| * | ARM: omap1: irq_data conversion.Lennert Buytenhek2011-01-133-39/+41
* | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-1/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into for-nextJiri Kosina2010-12-223-4/+5
| |\ \
| * | | suspend: constify platform_suspend_opsLionel Debroux2010-11-161-1/+1
| | |/ | |/|
* | | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-01-0636-451/+1510
|\ \ \
| * \ \ Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 i...Tony Lindgren2010-12-221-9/+8
| |\ \ \
| | * | | OMAP1: clock_data: use runtime cpu / machine checksJanusz Krzysztofik2010-12-211-9/+8
| * | | | Keyboard: omap-keypad: use matrix_keypad.hJanusz Krzysztofik2010-12-2213-342/+384
| |/ / /
| * | | Merge branch 'devel-dma' into omap-for-linusTony Lindgren2010-12-212-1/+391
| |\ \ \
| | * | | OMAP: DMA: Convert DMA library into platform driverG, Manjunath Kondaiah2010-12-202-3/+214
| | * | | OMAP1: DMA: Implement in platform device modelG, Manjunath Kondaiah2010-12-201-0/+179
| * | | | omap1: Fix innovator FPGA init for multi-omapTony Lindgren2010-12-202-9/+8
| * | | | I2C: i2c-omap: Change device name: i2c_omap -> omap_i2cBenoit Cousson2010-12-201-3/+3
| * | | | omap1: pm_bus: Fix compilation warningMarek Belisko2010-12-201-1/+0
| * | | | omap1: htc_herald: Fix compilation warningMarek Belisko2010-12-201-1/+1
| |/ / /
| * | | Merge branch 'devel-gpio' into omap-for-linusTony Lindgren2010-12-1018-50/+609
| |\ \ \
| | * | | omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xxTony Lindgren2010-12-073-0/+3
| | * | | OMAP: GPIO: Implement GPIO as a platform deviceVaradarajan, Charulatha2010-12-0715-16/+8
| | * | | OMAP7xx: GPIO: Introduce support for GPIO initVaradarajan, Charulatha2010-12-071-0/+261
| | * | | OMAP16xx: GPIO: Introduce support for GPIO initVaradarajan, Charulatha2010-12-071-0/+199
| | * | | OMAP15xx: GPIO: Introduce support for GPIO initVaradarajan, Charulatha2010-12-071-0/+98
| | * | | omap: Fix gpio_request calls to happen as arch_initcallTony Lindgren2010-12-076-34/+40
| * | | | omap1: Add initcall checks for omap1 and booted boardTony Lindgren2010-12-109-0/+30
| * | | | omap: Split omap_read/write functions for omap1 and omap2+Tony Lindgren2010-12-101-0/+39
| * | | | Merge branch 'devel-omap-irq' into omap-for-linusTony Lindgren2010-12-102-13/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | omap1: Use asm_irq_flags for entry-macro.STony Lindgren2010-12-092-13/+19
| | | |/ | | |/|
| | | |
| | \ \
| *-. \ \ Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-fo...Tony Lindgren2010-11-304-16/+7
| |\ \ \ \
| | | * | | OMAP1: drop AMS_DELTA_FIQ config optionJanusz Krzysztofik2010-11-303-14/+3
| | | | |/ | | | |/|
| | * | | OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbersAndrei Emeltchenko2010-11-301-2/+4
| | | |/ | | |/|
| * | | arm: omap1: board-ams-delta: fix castAaro Koskinen2010-11-241-1/+2
| * | | arm: omap1: mbox: delete unused variableAaro Koskinen2010-11-241-1/+0
| * | | arm: omap1: mbox: make variables staticAaro Koskinen2010-11-241-2/+2
| * | | arm: omap1: make some functions staticAaro Koskinen2010-11-242-2/+2
| * | | arm: omap1: add missing includesAaro Koskinen2010-11-244-0/+5
| |/ /
* | | Merge branch 'misc' into develRussell King2011-01-061-1/+1
|\ \ \
| * \ \ Merge branch 'smp' into miscRussell King2011-01-063-4/+5
| |\ \ \ | | |/ /
| * | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-261-1/+1
| | |/ | |/|
* | | ARM: omap: update clock source registrationRussell King2010-12-221-5/+1
| |/ |/|
* | ARM: 6484/1: fix compile warning in mm/init.cAnand Gadiyar2010-11-211-1/+1
* | arm: omap1: devices: need to return with a valueFelipe Balbi2010-11-081-3/+2
* | OMAP1: camera.h: add missing includeJanusz Krzysztofik2010-11-051-0/+2
|/
* Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-10-259-13/+567
|\
| * omap: Fix spotty MMC voltagesTony Lindgren2010-10-124-8/+4
| * Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...Tony Lindgren2010-10-081-0/+27
| |\
| | * OMAP: WDT: Split OMAP1 and OMAP2PLUS device registrationVaradarajan, Charulatha2010-09-291-0/+27
| * | OMAP1: Amstrad Delta: add camera controlled LEDS triggerJanusz Krzysztofik2010-10-011-0/+24
OpenPOWER on IntegriCloud