diff options
author | 2010-12-07 17:10:52 -0800 | |
---|---|---|
committer | 2010-12-07 17:10:52 -0800 | |
commit | 0a4bbddde29c038f2c51a7abb03d6d07e679d8af (patch) | |
tree | 4257a25f3802a2879d9bcfc5e1a5e1e38e59d948 /fs/btrfs/acl.c | |
parent | dmaengine i.MX SDMA: initialize on module_init (diff) | |
parent | fsldma: add support to 36-bit physical address (diff) | |
parent | intel_mid_dma: add support for single item scatter-gather list (diff) | |
download | linux-dev-0a4bbddde29c038f2c51a7abb03d6d07e679d8af.tar.xz linux-dev-0a4bbddde29c038f2c51a7abb03d6d07e679d8af.zip |
Merge branches 'fsldma' and 'intel-mid' into dmaengine