Subject: linux-next: manual merge of the wireless tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Apr 2010 11:28:39 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflicts in
drivers/net/wireless/libertas_tf/cmd.c and
drivers/net/wireless/libertas_tf/main.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
e9bd5bcde7af27ebb92bb866afde5ef5e4f3dc6c ("libertastf: add configurable
debug messages") from the wireless tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/wireless/libertas_tf/cmd.c
index b620daf,22645e4..0000000
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@@ -7,8 -7,7 +7,9 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#include <linux/slab.h>
 +
+ #include "deb_defs.h"
  #include "libertas_tf.h"
  
  static const struct channel_range channel_ranges[] = {
diff --cc drivers/net/wireless/libertas_tf/main.c
index 7533a23,3b1db84..0000000
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@@ -7,8 -7,7 +7,9 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#include <linux/slab.h>
 +
+ #include "deb_defs.h"
  #include "libertas_tf.h"
  #include "linux/etherdevice.h"