diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 20:41:21 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 20:41:21 +0400 |
| commit | 8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch) | |
| tree | c688d7980be8c1c0dbf5e411caaf2c102120102e /include/net/netdma.h | |
| parent | b770ea523d95837e968d46c7fe09a3f5edd9bb27 (diff) | |
| parent | d308ba50a1234b299a00e63a95e61fdeb2f1a2df (diff) | |
| download | linux-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz | |
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/net/netdma.h')
0 files changed, 0 insertions, 0 deletions