diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-09-02 15:13:44 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-02 15:13:44 +0400 |
| commit | 8516f52fa497b37eb3d5e58d34e61a41ae0a553a (patch) | |
| tree | b73175b134d36bea303d2f181ae89a448c2add81 /drivers/net/sky2.c | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 7b4b88e067d37cbbafd856121767f7e154294eb2 (diff) | |
| download | linux-8516f52fa497b37eb3d5e58d34e61a41ae0a553a.tar.xz | |
Merge branch 'next' into v3.1-rc4
Fixed trivial conflicts in drivers/dma/amba-pl08x.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/net/sky2.c')
0 files changed, 0 insertions, 0 deletions