diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 16:18:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-29 16:18:19 -0700 |
| commit | ec9c45d456fd7f1e400c75e6c8040d1deb9d4fff (patch) | |
| tree | 1266a162bbb28e4f85f6327c8c2bb19f95170e8d /arch/arm/mach-omap1/mailbox.c | |
| parent | aa221cb61792b941234ab458020c93ed97810161 (diff) | |
| parent | 59c5fe6d848cae8fd51498d17532f5aad3866f98 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
[ARM] 5562/2: at91: add gpio button support for at91sam9g20ek
[ARM] 5563/1: at91: at91sam9rlek lcd interface correction
[ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script
[ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQ
[ARM] GTA02: build fixes (s3c2410_nand_set usage)
[ARM] MINI2440: Add missing flash_bbt flat to NAND
[ARM] s3c2410_defconfig: add MINI2440 machine to build
[ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
[ARM] S3C24XX: Fix missing s3c_iis_device.
[ARM] MINI2440: remove duplicated #include
[ARM] S3C24XX: Fix spi-bus configuration build errors
OMAP: Fix IOMEM macro for assembly
[ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORT
[ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWM
OMAP2/3: Initialize gpio debounce register
OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry
OMAP3: RX51: Use OneNAND sync read / write
OMAP2/3: gpmc-onenand: correct use of async timings
OMAP3: DMA: Enable idlemodes for DMA OCP
OMAP3: SRAM size fix for HS/EMU devices
...
Diffstat (limited to 'arch/arm/mach-omap1/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap1/mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index 0af4d6c85b4..6810b4aeb02 100644 --- a/arch/arm/mach-omap1/mailbox.c +++ b/arch/arm/mach-omap1/mailbox.c @@ -203,5 +203,5 @@ module_exit(omap1_mbox_exit); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions"); -MODULE_AUTHOR("Hiroshi DOYU" <Hiroshi.DOYU@nokia.com>); +MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>"); MODULE_ALIAS("platform:omap1-mailbox"); |