diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 19:43:35 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 19:43:59 +0400 |
| commit | fcd8d84a585f3578a9ebdd27e757495a27415322 (patch) | |
| tree | 58f37676ad56d322e47d0fa7343afb85445f7649 /drivers/infiniband/hw/cxgb4/cq.c | |
| parent | eae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (diff) | |
| parent | 66a2886d867343eff6bf2646bea2c923d0cbf620 (diff) | |
| parent | 4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1 (diff) | |
| download | linux-fcd8d84a585f3578a9ebdd27e757495a27415322.tar.xz | |
Merge branches 'spear/clock' and 'imx/clock' into next/clock
Updated to resolve dependencies.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>