diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-21 21:23:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-21 21:23:01 +0100 |
commit | ed36604b25023c584fdf93df6073f65dac4b1129 (patch) | |
tree | 9bc35b4174f18af727f7d73b32e16efad85fce93 /virt | |
parent | e1000e: fixup merge error (diff) | |
parent | solos: Disable DMA until we have an FPGA update with it actually implemented. (diff) | |
download | linux-ed36604b25023c584fdf93df6073f65dac4b1129.tar.xz linux-ed36604b25023c584fdf93df6073f65dac4b1129.zip |
Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions