]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0caa29b9eb3bb4fa77e763ab991a6b76f973a16d
tree7f76abc095a90f7ad475417495d3d4f577080ae1
parent02f5e92c330003e7dcb3a9804b0de893b783e64e
parent5edf7a16477815625c237f3b6f41c5eef1543dc4
Merge branch 'master' of master.kernel.org:/pub/scm/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