| commit | 6f76c323038fd9df5cced93ee6145459656faaa7 | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 01:57:49 +0000 (31 11:57 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 01:57:49 +0000 (31 11:57 +1000) | ||
| tree | 4500bedadf3918940bf05a9617f7a861f361f386 | treesnapshot (tar.gz zip) |
| parent | 73269424c70213bb9b5339fa053c388dc4685f05 | commitdiff |
| parent | 7b4b88e067d37cbbafd856121767f7e154294eb2 | commitdiff |
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/amba-pl08x.c
Conflicts:
drivers/dma/amba-pl08x.c
| drivers/dma/amba-pl08x.c | diff1 | diff2 | blobhistory |