Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge

diff --cc net/key/af_key.c
Simple merge