Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[safe/jmp/linux-2.6] / drivers / net / ps3_gelic_net.c
2007-07-10 Masakazu Mokunops3: gigabit ethernet driver for PS3, take3