Merge branch 'linus' into core/futexes
[pandora-kernel.git] / drivers / net / e100.c
Simple merge