diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 22:13:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 22:13:58 -0500 |
| commit | 01539ba2a706ab7d35fc0667dff919ade7f87d63 (patch) | |
| tree | 5a4bd0cf78007d06690fe4ac06bbd49a5a70bc47 /MAINTAINERS | |
| parent | 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153 (diff) | |
| parent | dc69d1af9e8d9cbbabff88bb35a6782187a22229 (diff) | |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
omap2: Make OMAP2PLUS select OMAP_DM_TIMER
OMAP4: hwmod data: Fix alignment and end of line in structurefields
OMAP4: hwmod data: Move the DMA structures
OMAP4: hwmod data: Move the smartreflex structures
OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
arm: omap: tusb6010: add name for MUSB IRQ
arm: omap: craneboard: Add USB EHCI support
omap2+: Initialize serial port for dynamic remuxing for n8x0
omap2+: Add struct omap_board_data and use it for platform level serial init
omap2+: Allow hwmod state changes to mux pads based on the state changes
omap2+: Add support for hwmod specific muxing of devices
omap2+: Add omap_mux_get_by_name
OMAP2: PM: fix compile error when !CONFIG_SUSPEND
MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
OMAP4: Smartreflex framework extensions
OMAP4: hwmod: Add inital data for smartreflex modules.
OMAP4: PM: Program correct init voltages for scalable VDDs
OMAP4: Adding voltage driver support
OMAP4: Register voltage PMIC parameters with the voltage layer
OMAP3: PM: Program correct init voltages for VDD1 and VDD2
...
Fix up trivial conflict in arch/arm/plat-omap/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fd78afa0b147..bcb78306b62f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4363,6 +4363,20 @@ M: Deepak Saxena <dsaxena@plexity.net> | |||
| 4363 | S: Maintained | 4363 | S: Maintained |
| 4364 | F: drivers/char/hw_random/omap-rng.c | 4364 | F: drivers/char/hw_random/omap-rng.c |
| 4365 | 4365 | ||
| 4366 | OMAP HWMOD SUPPORT | ||
| 4367 | M: Benoît Cousson <b-cousson@ti.com> | ||
| 4368 | M: Paul Walmsley <paul@pwsan.com> | ||
| 4369 | L: linux-omap@vger.kernel.org | ||
| 4370 | S: Maintained | ||
| 4371 | F: arch/arm/mach-omap2/omap_hwmod.c | ||
| 4372 | F: arch/arm/plat-omap/include/plat/omap_hwmod.h | ||
| 4373 | |||
| 4374 | OMAP HWMOD DATA FOR OMAP4-BASED DEVICES | ||
| 4375 | M: Benoît Cousson <b-cousson@ti.com> | ||
| 4376 | L: linux-omap@vger.kernel.org | ||
| 4377 | S: Maintained | ||
| 4378 | F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c | ||
| 4379 | |||
| 4366 | OMAP USB SUPPORT | 4380 | OMAP USB SUPPORT |
| 4367 | M: Felipe Balbi <balbi@ti.com> | 4381 | M: Felipe Balbi <balbi@ti.com> |
| 4368 | M: David Brownell <dbrownell@users.sourceforge.net> | 4382 | M: David Brownell <dbrownell@users.sourceforge.net> |