diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-17 09:05:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-17 09:05:02 +0100 |
commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /.mailmap | |
parent | KS8695: fix ks8695_rx() unreasonable action. (diff) | |
parent | ppp: fix BUG on non-linear SKB (multilink receive) (diff) | |
download | linux-a2bfbc072e279ff81e6b336acff612b9bc2e5281.tar.xz linux-a2bfbc072e279ff81e6b336acff612b9bc2e5281.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions