From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Jul 2008 09:39:39 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.27-rc1~969^2~51
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=49997d75152b3d23c53b0fa730599f2f74c92c65;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
---

49997d75152b3d23c53b0fa730599f2f74c92c65
diff --cc drivers/net/fs_enet/fs_enet-main.c
index bdb81f5750a,352574a3f05..445763e5648
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@@ -43,8 -43,7 +43,8 @@@
  #include <asm/uaccess.h>
  
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
 +#include <linux/of_gpio.h>
- #include <asm/of_platform.h>
+ #include <linux/of_platform.h>
  #endif
  
  #include "fs_enet.h"
diff --cc drivers/net/wireless/rt2x00/rt73usb.c
index 34c6ff27afc,6a62d6bb96f..d383735ab8f
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@@ -890,9 -879,10 +890,9 @@@ static int rt73usb_load_firmware(struc
  	unsigned int i;
  	int status;
  	u32 reg;
- 	char *ptr = data;
+ 	const char *ptr = data;
  	char *cache;
  	int buflen;
 -	int timeout;
  
  	/*
  	 * Wait for stable hardware.
diff --cc net/8021q/vlan.c
index 9f04cab92f9,08f14f6c5fd..b661f47bf10
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@@ -22,13 -23,17 +22,16 @@@
  #include <linux/module.h>
  #include <linux/netdevice.h>
  #include <linux/skbuff.h>
 -#include <net/datalink.h>
 -#include <linux/mm.h>
 -#include <linux/in.h>
  #include <linux/init.h>
+ #include <linux/rculist.h>
+ #include <net/p8022.h>
+ #include <net/arp.h>
  #include <linux/rtnetlink.h>
  #include <linux/notifier.h>
 +#include <net/rtnetlink.h>
  #include <net/net_namespace.h>
  #include <net/netns/generic.h>
 +#include <asm/uaccess.h>
  
  #include <linux/if_vlan.h>
  #include "vlan.h"
diff --cc net/iucv/iucv.c
index d8e0635aace,cc34ac769a3..a598c738484
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@@ -480,8 -480,8 +480,8 @@@ static void iucv_setmask_mp(void
  		if (cpu_isset(cpu, iucv_buffer_cpumask) &&
  		    !cpu_isset(cpu, iucv_irq_cpumask))
  			smp_call_function_single(cpu, iucv_allow_cpu,
- 						 NULL, 0, 1);
+ 						 NULL, 1);
 -	preempt_enable();
 +	put_online_cpus();
  }
  
  /**
@@@ -521,9 -521,10 +521,14 @@@ static int iucv_enable(void
  		goto out;
  	/* Declare per cpu buffers. */
  	rc = -EIO;
 -	preempt_disable();
 +	get_online_cpus();
  	for_each_online_cpu(cpu)
++<<<<<<< HEAD:net/iucv/iucv.c
 +		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);
++=======
+ 		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
+ 	preempt_enable();
++>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
  	if (cpus_empty(iucv_buffer_cpumask))
  		/* No cpu could declare an iucv buffer. */
  		goto out_path;
@@@ -546,9 -545,7 +551,13 @@@ out
   */
  static void iucv_disable(void)
  {
++<<<<<<< HEAD:net/iucv/iucv.c
 +	get_online_cpus();
 +	on_each_cpu(iucv_retrieve_cpu, NULL, 0, 1);
 +	put_online_cpus();
++=======
+ 	on_each_cpu(iucv_retrieve_cpu, NULL, 1);
++>>>>>>> 5b664cb235e97afbf34db9c4d77f08ebd725335e:net/iucv/iucv.c
  	kfree(iucv_path_table);
  }