Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
authorDavid S. Miller <davem@davemloft.net>
Sun, 16 May 2010 06:14:16 +0000 (23:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 May 2010 06:14:16 +0000 (23:14 -0700)
commit1cdc5abf40c561982d2f7b06bcff17f9496309a5
tree92c0ca1688929a6660dc41e97df203aef23b8c09
parente0f43752a942b7be1bc06b9fd74e20ae337c1cca
parent0fb0a4f00aaf5de9f328273d7a46e3aa27dab496
Merge branch 'master' of git://git./linux/kernel/git/inaky/wimax
drivers/net/wimax/i2400m/control.c
drivers/net/wimax/i2400m/driver.c
drivers/net/wimax/i2400m/netdev.c
drivers/net/wimax/i2400m/rx.c