Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git] / drivers / net / netxen / netxen_nic_init.c
Simple merge