| commit | 8e8e43843ba3ced0c657cbc0fdb10644ec60f772 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Mar 27 18:48:56 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Mar 27 18:48:56 2008 -0700 |
| tree | e64954326ced9c365c52c256f01b5f9fb1bcae66 | |
| parent | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e [diff] | |
| parent | 50fd4407b8bfbde7c1a0bfe4f24de7df37164342 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/usb/rndis_host.c drivers/net/wireless/b43/dma.c net/ipv6/ndisc.c