diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-03 00:06:01 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-03 00:06:01 +0100 |
commit | 1707be1be18deb1deaecd768135290cffdeb0e8e (patch) | |
tree | 72c4c01b1797d3570c1037a9ad2514170afc1d00 /drivers/dma/ste_dma40.c | |
parent | net: dcbnl: check correct ops in dcbnl_ieee_set() (diff) | |
parent | e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead (diff) | |
download | linux-1707be1be18deb1deaecd768135290cffdeb0e8e.tar.xz linux-1707be1be18deb1deaecd768135290cffdeb0e8e.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/dma/ste_dma40.c')
0 files changed, 0 insertions, 0 deletions