diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 00:55:21 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 00:55:21 (GMT) |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/x86/kernel/trampoline_64.S | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
| download | linux-fsl-qoriq-bbb20089a3275a19e475dbc21320c3742e3ca423.tar.xz | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/x86/kernel/trampoline_64.S')
0 files changed, 0 insertions, 0 deletions