diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 19:31:33 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-29 19:31:33 +0400 |
| commit | 537994aa4708d26a577024b355ad1318ad49b552 (patch) | |
| tree | 7b5d4063498d6e84df0ccba73ce49b45d737725b /drivers/net/ethernet/dec/tulip/timer.c | |
| parent | ce58d2baf53c5f9ce9836b99328b419fed40fcbd (diff) | |
| parent | cbf14f3ab9bd6295b345fc812f08ddd844fb183e (diff) | |
| download | linux-537994aa4708d26a577024b355ad1318ad49b552.tar.xz | |
Merge branch 'omap-for-v3.17/mailbox' into next/drivers
This is a dependency for the mailbox driver code and gets
merged through the soc branch
* branch 'omap-for-v3.17/mailbox':
ARM: AM33xx: hwmod_data: Remove legacy mailbox addrs
ARM: OMAP4: hwmod_data: Remove legacy mailbox addrs
ARM: OMAP2: hwmod_data: Remove legacy mailbox data and addrs
ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
ARM: DRA7: hwmod_data: Add mailbox hwmod data
ARM: dts: DRA7: Add mailbox nodes
ARM: dts: AM4372: Correct mailbox node data
ARM: dts: AM33xx: Add mailbox node
ARM: dts: OMAP4: Add mailbox node
ARM: dts: OMAP2+: Add mailbox fifo and user information
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/ethernet/dec/tulip/timer.c')
0 files changed, 0 insertions, 0 deletions