diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/isdn/hisax | |
| parent | Fix typos in comments in via-velocity header. (diff) | |
| parent | ixgbe: remove unnecessary call to device_init_wakeup (diff) | |
| download | linux-dev-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.xz linux-dev-74d154189d597b91da4322996dbf4f5c3d1544ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/isdn/hisax')
0 files changed, 0 insertions, 0 deletions