diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-26 10:13:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-26 10:13:30 +1100 |
| commit | 4371b34a7d01a20d2da3786f5cd287e7f49ad89e (patch) | |
| tree | e974af1aadf8ddd9a5adaf3b205baa9633f1b9d2 /include | |
| parent | ab808be305f99afc7f07887ee63968154d76ce36 (diff) | |
| parent | 635d9920bef8fe27f8cc85efcd80b3a7c53c1a89 (diff) | |
Merge commit 'pxa/for-next'
Conflicts:
arch/arm/plat-pxa/dma.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions