pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

Merge branch 'master' into upstream

Conflicts:

drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c

Unnamed repository; edit this file 'description' to name the repository.

drivers/net/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri10ge/myri10ge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ns83820.c	diff1 \|	diff2 \|	blob \| history