aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-27 21:56:31 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-27 21:56:31 +0000
commit3e61aa207f81525fb43996d60549d713d0c373ae (patch)
tree8965b4bfd88e8c052c94295e30cce8b409819c96 /drivers/net/ethernet/marvell
parentMerge branch 'ux500/devel' into next/devel (diff)
parentMerge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/hwmod (diff)
downloadlinux-dev-3e61aa207f81525fb43996d60549d713d0c373ae.tar.xz
linux-dev-3e61aa207f81525fb43996d60549d713d0c373ae.zip
Merge branch 'omap/hwmod' into next/devel
* omap/hwmod: ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1 ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4 ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3 ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3 ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3 ARM: OMAP: rx51: fix USB ARM: OMAP: mcbsp: Fix possible memory corruption
Diffstat (limited to 'drivers/net/ethernet/marvell')
0 files changed, 0 insertions, 0 deletions