| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jun 16 18:25:48 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jun 16 18:25:48 2008 -0700 |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 [diff] | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c net/sctp/protocol.c