Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h

diff --cc arch/arm/mach-exynos/dev-sysmmu.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31lilly.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31lite.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-sx1.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/clockdomain.c
Simple merge

diff --cc arch/arm/mach-omap2/display.c
Simple merge

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc arch/arm/mach-omap2/prcm.c
Simple merge

diff --cc arch/arm/mach-omap2/voltage.c
index 64070ac1e761048caf85bf5fb4ebad2e06b85197,e964cfd3a3d0108fd5967a2d337fd5842eef258f..1f8fdf736e630976bc97fc781d58bfbf85704179
--- 1/arch/arm/mach-omap2/voltage.c
--- 2/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@@ -21,10 -21,11 +21,11 @@@
  
  #include <linux/delay.h>
  #include <linux/io.h>
 -#include <linux/clk.h>
  #include <linux/err.h>
+ #include <linux/export.h>
  #include <linux/debugfs.h>
  #include <linux/slab.h>
 +#include <linux/clk.h>
  
  #include <plat/common.h>
  

diff --cc arch/arm/mach-s3c2410/mach-h1940.c
Simple merge

diff --cc arch/arm/mach-tegra/pcie.c
Simple merge

diff --cc arch/arm/plat-samsung/dev-backlight.c
index 2adbeaed4c042262d0ef4f9cdf0beb2dded2cf5b,a976c023b286b4a1b991cfa63c2dc93e9912151d..e657305644cc27140f8c878d99e34ac2ea668ac0
--- 1/arch/arm/plat-samsung/dev-backlight.c
--- 2/arch/arm/plat-samsung/dev-backlight.c
+++ b/arch/arm/plat-samsung/dev-backlight.c
@@@ -12,9 -12,9 +12,10 @@@
  
  #include <linux/gpio.h>
  #include <linux/platform_device.h>
+ #include <linux/slab.h>
  #include <linux/io.h>
  #include <linux/pwm_backlight.h>
 +#include <linux/slab.h>
  
  #include <plat/devs.h>
  #include <plat/gpio-cfg.h>

diff --cc arch/arm/plat-samsung/platformdata.c
Simple merge

diff --cc arch/microblaze/kernel/dma.c
index dc6416d265d616e1ac65382b5174c81c1b22d723,b159b8a847d69144d0a74753dca4d315bb80a7fd..65a4af4cbbbe864bb10eb75ff7fd1426c8021950
--- 1/arch/microblaze/kernel/dma.c
--- 2/arch/microblaze/kernel/dma.c
+++ b/arch/microblaze/kernel/dma.c
@@@ -10,7 -10,9 +10,8 @@@
  #include <linux/dma-mapping.h>
  #include <linux/gfp.h>
  #include <linux/dma-debug.h>
+ #include <linux/export.h>
  #include <asm/bug.h>
 -#include <asm/cacheflush.h>
  
  /*
   * Generic direct DMA implementation

diff --cc arch/mips/kernel/cpu-probe.c
Simple merge

diff --cc arch/powerpc/include/asm/machdep.h
Simple merge

diff --cc arch/powerpc/kernel/dma-iommu.c
Simple merge

diff --cc arch/powerpc/kernel/dma.c
Simple merge

diff --cc arch/powerpc/kernel/ibmebus.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/prom.c
Simple merge

diff --cc arch/powerpc/kernel/ptrace.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/mmu_context_hash64.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge

diff --cc arch/powerpc/platforms/ps3/system-bus.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/eeh.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge

diff --cc arch/powerpc/sysdev/cpm_common.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_rio.c
Simple merge

diff --cc arch/powerpc/xmon/xmon.c
Simple merge

diff --cc arch/sh/kernel/topology.c
index ecc2d3d0f54a3bd142500fae47b207ad421ee699,ab37955b453a592f5034bb4eb8f89ff055764fd8..4649a6ff0cfefa1f64e7ce91dd2105f15ac8eccd
--- 1/arch/sh/kernel/topology.c
--- 2/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@@ -11,9 -11,9 +11,10 @@@
  #include <linux/cpumask.h>
  #include <linux/init.h>
  #include <linux/percpu.h>
 +#include <linux/topology.h>
  #include <linux/node.h>
  #include <linux/nodemask.h>
+ #include <linux/export.h>
  
  static DEFINE_PER_CPU(struct cpu, cpu_devices);
  

diff --cc arch/sh/mm/init.c
Simple merge

diff --cc arch/x86/crypto/aes_glue.c
index b0b6950cc8c8850d68366b869ca39e4250827013,bdce3eeeaa37633ead43d56065892cfaa4a53c58..8efcf42a9d7e318b4cddb93a820cd01d1bd01f4e
--- 1/arch/x86/crypto/aes_glue.c
--- 2/arch/x86/crypto/aes_glue.c
+++ b/arch/x86/crypto/aes_glue.c
@@@ -3,8 -3,8 +3,9 @@@
   *
   */
  
+ #include <linux/module.h>
  #include <crypto/aes.h>
 +#include <asm/aes.h>
  
  asmlinkage void aes_enc_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);
  asmlinkage void aes_dec_blk(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 864830e1dd655839dec78d5b45ed2e27442305c8,537c89e0009519900f51451095907f138576dfa5..362056aefeb474c86b165c4f9c77d213b40fdbfa
--- 1/arch/x86/kernel/cpu/mcheck/mce.c
--- 2/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -36,7 -36,9 +36,8 @@@
  #include <linux/fs.h>
  #include <linux/mm.h>
  #include <linux/debugfs.h>
 -#include <linux/edac_mce.h>
  #include <linux/irq_work.h>
+ #include <linux/export.h>
  
  #include <asm/processor.h>
  #include <asm/mce.h>

diff --cc block/ioctl.c
Simple merge

diff --cc drivers/base/power/runtime.c
Simple merge

diff --cc drivers/block/aoe/aoeblk.c
Simple merge

diff --cc drivers/block/ps3vram.c
Simple merge

diff --cc drivers/block/virtio_blk.c
Simple merge

diff --cc drivers/char/ttyprintk.c
Simple merge

diff --cc drivers/char/virtio_console.c
Simple merge

diff --cc drivers/dma/imx-dma.c
Simple merge

diff --cc drivers/dma/imx-sdma.c
Simple merge

diff --cc drivers/dma/intel_mid_dma.c
Simple merge

diff --cc drivers/dma/ipu/ipu_idmac.c
Simple merge

diff --cc drivers/gpio/gpio-mxc.c
Simple merge

diff --cc drivers/gpio/gpio-mxs.c
Simple merge

diff --cc drivers/hid/hid-roccat.c
Simple merge

diff --cc drivers/i2c/busses/i2c-sh7760.c
Simple merge

diff --cc drivers/i2c/busses/i2c-tegra.c
Simple merge

diff --cc drivers/infiniband/core/cm.c
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/mad.c
Simple merge

diff --cc drivers/infiniband/core/sysfs.c
Simple merge

diff --cc drivers/infiniband/core/ucma.c
Simple merge

diff --cc drivers/infiniband/core/umem.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
index 42517500b223e98b0e9dd265e799233057dde9f4,a8923ffc64594eba2e00a83645bd4d58534d011b..602b1bd723a963aa49904fc0a907d12d965b009e
--- 1/drivers/infiniband/core/verbs.c
--- 2/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@@ -38,8 -38,8 +38,9 @@@
  
  #include <linux/errno.h>
  #include <linux/err.h>
+ #include <linux/export.h>
  #include <linux/string.h>
 +#include <linux/slab.h>
  
  #include <rdma/ib_verbs.h>
  #include <rdma/ib_cache.h>

diff --cc drivers/infiniband/hw/cxgb4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/mthca/mthca_provider.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_driver.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_file_ops.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_iba7220.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_iba7322.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_init.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_fs.c
Simple merge

diff --cc drivers/infiniband/ulp/iser/iscsi_iser.c
Simple merge

diff --cc drivers/leds/leds-asic3.c
Simple merge

diff --cc drivers/leds/leds-gpio.c
Simple merge

diff --cc drivers/leds/leds-lm3530.c
Simple merge

diff --cc drivers/md/dm-log-userspace-base.c
Simple merge

diff --cc drivers/md/dm-raid.c
Simple merge

diff --cc drivers/md/faulty.c
Simple merge

diff --cc drivers/md/linear.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/multipath.c
Simple merge

diff --cc drivers/md/raid0.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/media/common/saa7146_core.c
index f5d53a2023442fbfe1bb8c9bf77817e0fd051174,31e53b6a881aa2f7894d72f43bb3fe50e84495a6..d6b1cf66042d196b40a7b99c18241fe186840d1d
--- 1/drivers/media/common/saa7146_core.c
--- 2/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@@ -18,9 -18,8 +18,10 @@@
      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
  #include <media/saa7146.h>
+ #include <linux/module.h>
  
  LIST_HEAD(saa7146_devices);
  DEFINE_MUTEX(saa7146_devices_lock);

diff --cc drivers/media/common/saa7146_fops.c
index a92546144eaa30dc33695104374841b73b5b2bda,e4547afcfa8809e41c9488b380c58939188ca719..71f8e018e564818225137d437ecbc369418a5519
--- 1/drivers/media/common/saa7146_fops.c
--- 2/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@@ -1,6 -1,5 +1,7 @@@
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
  #include <media/saa7146_vv.h>
+ #include <linux/module.h>
  
  /****************************************************************************/
  /* resource management functions, shamelessly stolen from saa7134 driver */

diff --cc drivers/media/common/saa7146_hlp.c
index 79ad73accb27426a058c03ef4481be174988eda0,c9c6e9a6c31d30e187ef38b480d0a46a226f1803..bc1f545c95cb2b669cae45a7e59bfe268e4d2844
--- 1/drivers/media/common/saa7146_hlp.c
--- 2/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@@ -1,6 -1,5 +1,7 @@@
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
  #include <linux/kernel.h>
+ #include <linux/export.h>
  #include <media/saa7146_vv.h>
  
  static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)

diff --cc drivers/media/common/saa7146_video.c
index 384b358d30379dfcdef7a99428bea28c24f7b77f,3a00253fe1ee8bc6ab5e0e3fb89ef8cd451feef2..ce30533fd9724e1f802ecb6f67a6e6f42f998a65
--- 1/drivers/media/common/saa7146_video.c
--- 2/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@@ -1,7 -1,6 +1,8 @@@
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
  #include <media/saa7146_vv.h>
  #include <media/v4l2-chip-ident.h>
+ #include <linux/module.h>
  
  static int max_memory = 32;
  

diff --cc drivers/media/dvb/frontends/dibx000_common.c
index 774d507b66cc7e841b412efe4c06ea4a6c8c1be5,977211fec137bdcf668ef7a022f23548e38ae11b..43be7238311ec513726e8ecaa13d0864c2b622dd
--- 1/drivers/media/dvb/frontends/dibx000_common.c
--- 2/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@@ -1,5 -1,5 +1,6 @@@
  #include <linux/i2c.h>
 +#include <linux/mutex.h>
+ #include <linux/module.h>
  
  #include "dibx000_common.h"
  

diff --cc drivers/media/radio/radio-wl1273.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/media/rc/ir-lirc-codec.c
Simple merge

diff --cc drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
Simple merge

diff --cc drivers/media/rc/rc-main.c
Simple merge

diff --cc drivers/media/video/adp1653.c
index 5914390211ff2ac6f087ec5693c08234ec55bd7d,c2594948ca3fad7cbc7c4d52a327b1fa57a94904..12eedf4d515aa86dcf60107de69158895ae04795
--- 1/drivers/media/video/adp1653.c
--- 2/drivers/media/video/adp1653.c
+++ b/drivers/media/video/adp1653.c
@@@ -31,8 -31,8 +31,9 @@@
   */
  
  #include <linux/delay.h>
+ #include <linux/module.h>
  #include <linux/i2c.h>
 +#include <linux/module.h>
  #include <linux/slab.h>
  #include <linux/version.h>
  #include <media/adp1653.h>

diff --cc drivers/media/video/cx25840/cx25840-ir.c
Simple merge

diff --cc drivers/media/video/hexium_gemini.c
Simple merge

diff --cc drivers/media/video/hexium_orion.c
Simple merge

diff --cc drivers/media/video/imx074.c
index 8775e262bb6e8b9f42f19a467ed37ec806ff79e4,3319b40c87a4fd584a554dd32c9eb433cb0cc0f6..eec75bb57203f4c044ce8072616f625094a78385
--- 1/drivers/media/video/imx074.c
--- 2/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@@ -12,11 -12,12 +12,12 @@@
  
  #include <linux/delay.h>
  #include <linux/i2c.h>
 +#include <linux/v4l2-mediabus.h>
  #include <linux/slab.h>
  #include <linux/videodev2.h>
+ #include <linux/module.h>
  
  #include <media/soc_camera.h>
 -#include <media/soc_mediabus.h>
  #include <media/v4l2-subdev.h>
  #include <media/v4l2-chip-ident.h>
  

diff --cc drivers/media/video/m5mols/m5mols_core.c
Simple merge

diff --cc drivers/media/video/mt9m001.c
index 63ae5c61c9bf9af4f63c32f0ed6ed3e513206d1a,6866a9ef3f60c1e31330c37de2c4941de4d5ef18..e2b1029b16cdd24552123d67dfc4a44ef51a6359
--- 1/drivers/media/video/mt9m001.c
--- 2/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@@ -12,12 -12,11 +12,13 @@@
  #include <linux/slab.h>
  #include <linux/i2c.h>
  #include <linux/log2.h>
+ #include <linux/module.h>
  
 +#include <media/soc_camera.h>
 +#include <media/soc_mediabus.h>
  #include <media/v4l2-subdev.h>
  #include <media/v4l2-chip-ident.h>
 -#include <media/soc_camera.h>
 +#include <media/v4l2-ctrls.h>
  
  /*
   * mt9m001 i2c address 0x5d

diff --cc drivers/media/video/mt9m111.c
index f023cc092c2b8ea6d435daaf77e802ae74ef0ad3,66e3c3c2e60601fb8ac4319397df4b051207de24..cf2c0fb95f2f47d96121e55a4e4d87a07c076bcf
--- 1/drivers/media/video/mt9m111.c
--- 2/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@@ -13,12 -13,11 +13,13 @@@
  #include <linux/log2.h>
  #include <linux/gpio.h>
  #include <linux/delay.h>
 +#include <linux/v4l2-mediabus.h>
+ #include <linux/module.h>
  
 +#include <media/soc_camera.h>
  #include <media/v4l2-common.h>
 +#include <media/v4l2-ctrls.h>
  #include <media/v4l2-chip-ident.h>
 -#include <media/soc_camera.h>
  
  /*
   * MT9M111, MT9M112 and MT9M131:

diff --cc drivers/media/video/mt9t031.c
index 7ee84cc578b9d2d018358bb6d1a44b7415fdb994,e6e0238eca16a4bb5b1f6ddfabe2e71a323bec88..0e78477452ffb81bf5a09a781d9b68326b61e345
--- 1/drivers/media/video/mt9t031.c
--- 2/drivers/media/video/mt9t031.c
+++ b/drivers/media/video/mt9t031.c
@@@ -13,8 -13,8 +13,9 @@@
  #include <linux/log2.h>
  #include <linux/pm.h>
  #include <linux/slab.h>
 +#include <linux/v4l2-mediabus.h>
  #include <linux/videodev2.h>
+ #include <linux/module.h>
  
  #include <media/soc_camera.h>
  #include <media/v4l2-chip-ident.h>

diff --cc drivers/media/video/mt9v022.c
index b6a29f7de82cf60ff6cbf21c878db52f43afbd78,c74d6604598ebcf8c9dfafdc2f2b43672e39f963..690ee0d42eebbcbb8aaf7374ca49a7302716180f
--- 1/drivers/media/video/mt9v022.c
--- 2/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@@ -13,12 -13,11 +13,13 @@@
  #include <linux/i2c.h>
  #include <linux/delay.h>
  #include <linux/log2.h>
+ #include <linux/module.h>
  
 +#include <media/soc_camera.h>
 +#include <media/soc_mediabus.h>
  #include <media/v4l2-subdev.h>
  #include <media/v4l2-chip-ident.h>
 -#include <media/soc_camera.h>
 +#include <media/v4l2-ctrls.h>
  
  /*
   * mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c

diff --cc drivers/media/video/mxb.c
Simple merge

diff --cc drivers/media/video/noon010pc30.c
Simple merge

diff --cc drivers/media/video/ov6650.c
index d5b057207a7b969b330d20e02161ac7a0bf7c245,2e1680631f0fe4913f204bd07da42cc4e7031e43..9f2d26b1d4cb8e2af6a48ccdc9c3f66c4bc87715
--- 1/drivers/media/video/ov6650.c
--- 2/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <linux/delay.h>
  #include <linux/i2c.h>
  #include <linux/slab.h>
 +#include <linux/v4l2-mediabus.h>
+ #include <linux/module.h>
  
  #include <media/soc_camera.h>
  #include <media/v4l2-chip-ident.h>

diff --cc drivers/media/video/pvrusb2/pvrusb2-hdw.c
Simple merge

diff --cc drivers/media/video/pvrusb2/pvrusb2-v4l2.c
Simple merge

diff --cc drivers/media/video/rj54n1cb0c.c
index 6afc6168954926cb0f4715150798ea217255ca79,985965f744ffdb16f366e352b40cc70fb481fbbf..9937386a3baef7e0bf252eb82d75a2283b89b97a
--- 1/drivers/media/video/rj54n1cb0c.c
--- 2/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@@ -11,8 -11,8 +11,9 @@@
  #include <linux/delay.h>
  #include <linux/i2c.h>
  #include <linux/slab.h>
 +#include <linux/v4l2-mediabus.h>
  #include <linux/videodev2.h>
+ #include <linux/module.h>
  
  #include <media/rj54n1cb0c.h>
  #include <media/soc_camera.h>

diff --cc drivers/media/video/sh_mobile_csi2.c
Simple merge

diff --cc drivers/media/video/sr030pc30.c
Simple merge

diff --cc drivers/media/video/tvp7002.c
Simple merge

diff --cc drivers/media/video/v4l2-ctrls.c
Simple merge

diff --cc drivers/media/video/v4l2-device.c
index 9fc0ae8a526a4958995dd76fbedefd630d736879,c742b1f5e73efa6c226ddfae2d3b80d01df0bd2e..0edd618b9ddf17c1a117b157428df48ceccca1ae
--- 1/drivers/media/video/v4l2-device.c
--- 2/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@@ -20,8 -20,8 +20,9 @@@
  
  #include <linux/types.h>
  #include <linux/ioctl.h>
+ #include <linux/module.h>
  #include <linux/i2c.h>
 +#include <linux/slab.h>
  #if defined(CONFIG_SPI)
  #include <linux/spi/spi.h>
  #endif

diff --cc drivers/media/video/v4l2-subdev.c
Simple merge

diff --cc drivers/mfd/ab3100-core.c
Simple merge

diff --cc drivers/mfd/asic3.c
Simple merge

diff --cc drivers/mfd/max8997.c
index dc58750bb71bbfc52c45fd8afe93be1d5d288be7,50ad93bb49ddfbf4e4839f81102fd98299958dbf..5be53ae9b61cf2a6d6c318c881e43605b3dee526
--- 1/drivers/mfd/max8997.c
--- 2/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@@ -23,8 -23,8 +23,9 @@@
  
  #include <linux/slab.h>
  #include <linux/i2c.h>
 +#include <linux/interrupt.h>
  #include <linux/pm_runtime.h>
+ #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/mfd/core.h>
  #include <linux/mfd/max8997.h>

diff --cc drivers/mfd/twl-core.c
Simple merge

diff --cc drivers/mfd/twl6030-irq.c
Simple merge

diff --cc drivers/net/bonding/bond_procfs.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/eq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/fw.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mr.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/pd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/port.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/qp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/srq.c
Simple merge

diff --cc drivers/platform/x86/wmi.c
Simple merge

diff --cc drivers/regulator/88pm8607.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/db8500-prcmu.c
Simple merge

diff --cc drivers/regulator/mc13783-regulator.c
Simple merge

diff --cc drivers/regulator/tps6586x-regulator.c
Simple merge

diff --cc drivers/s390/char/vmur.c
index d291a54acfad5f94ec127cfdbff6e37d5b8cf85d,b95cbdccc11a506128c5e8c237f3c7121fbed86e..85f4a9a5d12e5d00a7e445bd1e1e0a784eaf7cd0
--- 1/drivers/s390/char/vmur.c
--- 2/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@@ -11,8 -11,10 +11,9 @@@
  #define KMSG_COMPONENT "vmur"
  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
  
 -#include <linux/kernel_stat.h>
  #include <linux/cdev.h>
  #include <linux/slab.h>
+ #include <linux/module.h>
  
  #include <asm/uaccess.h>
  #include <asm/cio.h>

diff --cc drivers/s390/cio/qdio_debug.c
Simple merge

diff --cc drivers/s390/kvm/kvm_virtio.c
Simple merge

diff --cc drivers/scsi/device_handler/scsi_dh.c
Simple merge

diff --cc drivers/scsi/device_handler/scsi_dh_alua.c
Simple merge

diff --cc drivers/scsi/libfc/fc_exch.c
Simple merge

diff --cc drivers/scsi/libfc/fc_lport.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/staging/media/solo6x10/g723.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/target_core_alua.c
Simple merge

diff --cc drivers/target/target_core_device.c
Simple merge

diff --cc drivers/target/target_core_pscsi.c
Simple merge

diff --cc drivers/target/target_core_tmr.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/video/backlight/l4f00242t03.c
Simple merge

diff --cc drivers/w1/w1_int.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_client.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/logfs/super.c
Simple merge

diff --cc fs/nfs/nfs4filelayout.c
Simple merge

diff --cc fs/nfs/pagelist.c
Simple merge

diff --cc fs/nfs/pnfs.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

diff --cc fs/nfsd/nfssvc.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/crypto.h
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/dmaengine.h
index ace51af4369f668ea647f47c2d87f76d4478b121,1ceff5ae9d31c2df27b1e6bcc46df342a5b43125..75f53f874b24a0c0abb790f501f2f60ace48e17e
--- 1/include/linux/dmaengine.h
--- 2/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -24,8 -24,11 +24,10 @@@
  #include <linux/device.h>
  #include <linux/uio.h>
  #include <linux/dma-direction.h>
 +#include <linux/scatterlist.h>
+ #include <linux/bitmap.h>
+ #include <asm/page.h>
  
 -struct scatterlist;
 -
  /**
   * typedef dma_cookie_t - an opaque DMA cookie
   *

diff --cc include/linux/gameport.h
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc include/media/saa7146.h
Simple merge

diff --cc include/net/inet_timewait_sock.h
Simple merge

diff --cc include/net/ip_vs.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/sound/core.h
Simple merge

diff --cc include/xen/xenbus.h
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc kernel/crash_dump.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/freezer.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/power/qos.c
Simple merge

diff --cc kernel/stop_machine.c
Simple merge

diff --cc kernel/sys.c
Simple merge

diff --cc kernel/utsname_sysctl.c
Simple merge

diff --cc mm/bounce.c
Simple merge

diff --cc mm/highmem.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/rmap.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/swap.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc net/8021q/vlan_core.c
index 163397f1fd5adefd655efcfb681544b1a56655bf,1f64cc9da1b09b75b40ccf532580ef20cdbe7c29..f5ffc02729d60396aac6abbdcbfc49bf1ebf20e1
--- 1/net/8021q/vlan_core.c
--- 2/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@@ -2,9 -2,10 +2,10 @@@
  #include <linux/netdevice.h>
  #include <linux/if_vlan.h>
  #include <linux/netpoll.h>
+ #include <linux/export.h>
  #include "vlan.h"
  
 -bool vlan_do_receive(struct sk_buff **skbp)
 +bool vlan_do_receive(struct sk_buff **skbp, bool last_handler)
  {
        struct sk_buff *skb = *skbp;
        u16 vlan_id = skb->vlan_tci & VLAN_VID_MASK;

diff --cc net/ipv4/udplite.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/netfilter.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/udplite.c
Simple merge

diff --cc sound/core/control.c
Simple merge

diff --cc sound/core/hwdep.c
Simple merge

diff --cc sound/pci/hda/hda_hwdep.c
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge

diff --cc sound/pci/hda/patch_via.c
Simple merge

diff --cc sound/pci/intel8x0.c
Simple merge

diff --cc sound/pci/rme9652/hdsp.c
Simple merge

diff --cc sound/pci/rme9652/hdspm.c
Simple merge

diff --cc sound/soc/samsung/ac97.c
Simple merge

diff --cc sound/soc/samsung/dma.c
Simple merge