diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-02 12:45:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-02 12:45:44 -0700 |
| commit | 7162f6691e9d39d8d866574687cddb3f1ec65d72 (patch) | |
| tree | c511679caf5c825ede4728870c513f92f4f1616b /drivers/net/s2io.c | |
| parent | 250e061e1d3e26600236a3dd9172e7f5f5916c00 (diff) | |
| parent | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions