Merge branch 'master' into for-next

This commit is contained in:
Jiri Kosina 2010-04-23 02:08:44 +02:00
commit 6c9468e9eb
5526 changed files with 96455 additions and 43399 deletions

View file

@ -72,6 +72,7 @@
* wimax_msg_send()
*/
#include <linux/device.h>
#include <linux/slab.h>
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <linux/wimax.h>

View file

@ -51,6 +51,7 @@
* wimax_rfkill_rm()
*/
#include <linux/device.h>
#include <linux/gfp.h>
#include <net/genetlink.h>
#include <linux/netdevice.h>
#include <linux/wimax.h>