diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-25 00:01:29 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-25 00:01:29 +0100 |
commit | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (patch) | |
tree | 0789ba36d96dba330416a1e6a9a68e891a78802a /net/ipx | |
parent | net/ipv6: Move && and || to end of previous line (diff) | |
parent | ath9k: set ps_default as false (diff) | |
download | linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.tar.xz linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/ipx')
0 files changed, 0 insertions, 0 deletions