| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Oct 06 19:39:31 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Oct 06 19:39:31 2010 -0700 |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 [diff] | |
| parent | 12e94471b2be5ef9b55b10004a3a2cd819490036 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/pcmcia/pcnet_cs.c net/caif/caif_socket.c