Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 19 Jun 2008 23:00:04 +0000 (16:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Jun 2008 23:00:04 +0000 (16:00 -0700)
commit0344f1c66b544609e867bd24aa7bfa789dfa9830
tree7f76abc095a90f7ad475417495d3d4f577080ae1
parentdad9b335c6940de2746a9788eb456d09cf102f81
parentef3a62d272f033989e83eb1f26505f93f93e3e69
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

net/mac80211/tx.c
drivers/net/atlx/atl1.c
drivers/net/sky2.c
net/mac80211/tx.c
net/netfilter/nf_conntrack_extend.c
net/unix/af_unix.c