Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...
David S. Miller [Tue, 25 May 2010 21:05:24 +0000 (14:05 -0700)]
1  2 
drivers/net/wimax/i2400m/rx.c

Simple merge