diff options
author | Dan Williams | 2009-09-09 02:42:29 +0200 |
---|---|---|
committer | Dan Williams | 2009-09-09 02:42:29 +0200 |
commit | f9dd2134374c8de6b911e2b8652c6c9622eaa658 (patch) | |
tree | c1b8f8d622941606b9e7247ab31d811ba4295011 /net/mac80211/cfg.h | |
parent | net_dma: poll for a descriptor after allocation failure (diff) | |
parent | md/raid456: distribute raid processing over multiple cores (diff) | |
download | kernel-qcow2-linux-f9dd2134374c8de6b911e2b8652c6c9622eaa658.tar.gz kernel-qcow2-linux-f9dd2134374c8de6b911e2b8652c6c9622eaa658.tar.xz kernel-qcow2-linux-f9dd2134374c8de6b911e2b8652c6c9622eaa658.zip |
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts:
include/linux/dmaengine.h
Diffstat (limited to 'net/mac80211/cfg.h')
0 files changed, 0 insertions, 0 deletions