Merge remote-tracking branch 'moduleh/module.h-split'
commitbc4c05687705979c74c4016f8ffb7c750df6ce88
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 04:14:33 +0000 (31 14:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 04:14:46 +0000 (31 14:14 +1000)
treed09085f53a624bfa90fe2ea069f955e131263c74
parentaf2f332df9b9ffd7e8eeac7d4c1fad1afefcb0aa
parent25215aa319f0bd032840e6f509d490e919e7234c
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h
182 files changed:
arch/arm/common/scoop.c
arch/arm/kernel/setup.c
arch/arm/mach-bcmring/mm.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-imx/mach-mx31lilly.c
arch/arm/mach-imx/mach-mx31lite.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-ixp2000/core.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-sa1100/jornada720.c
arch/arm/mm/init.c
arch/arm/plat-samsung/dev-ts.c
arch/arm/plat-samsung/platformdata.c
arch/blackfin/mach-bf518/boards/ezbrd.c
arch/blackfin/mach-bf527/boards/ad7160eval.c
arch/blackfin/mach-bf527/boards/ezkit.c
arch/blackfin/mach-bf527/boards/tll6527m.c
arch/blackfin/mach-bf537/boards/dnp5370.c
arch/mips/bcm47xx/gpio.c
arch/mips/bcm47xx/setup.c
arch/mips/kernel/traps.c
arch/powerpc/sysdev/fsl_rio.c
arch/sparc/kernel/pcic.c
arch/sparc/kernel/setup_64.c
arch/x86/kernel/cpu/amd.c
block/bsg-lib.c
block/ioctl.c
drivers/ata/libata-eh.c
drivers/base/power/common.c
drivers/base/power/main.c
drivers/base/power/runtime.c
drivers/bcma/core.c
drivers/bcma/driver_chipcommon.c
drivers/bcma/driver_pci.c
drivers/bcma/main.c
drivers/char/virtio_console.c
drivers/clocksource/sh_cmt.c
drivers/firmware/google/gsmi.c
drivers/gpio/gpio-ep93xx.c
drivers/hid/hid-axff.c
drivers/hid/hid-debug.c
drivers/hid/hid-picolcd.c
drivers/hid/hid-sjoy.c
drivers/hid/usbhid/hid-quirks.c
drivers/input/input-mt.c
drivers/input/input-polldev.c
drivers/input/misc/ad714x.c
drivers/leds/leds-asic3.c
drivers/md/dm-raid.c
drivers/md/md.c
drivers/md/persistent-data/dm-btree-remove.c
drivers/md/persistent-data/dm-btree.c
drivers/md/persistent-data/dm-space-map-disk.c
drivers/md/persistent-data/dm-transaction-manager.c
drivers/mfd/ab3550-core.c
drivers/mfd/asic3.c
drivers/mfd/max8997.c
drivers/mfd/twl6030-irq.c
drivers/mfd/wm8400-core.c
drivers/misc/ab8500-pwm.c
drivers/misc/ti-st/st_kim.c
drivers/mmc/core/debugfs.c
drivers/mmc/core/host.c
drivers/mmc/core/mmc_ops.c
drivers/mmc/core/sd.c
drivers/mmc/core/sd_ops.c
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sh_mobile_sdhi.c
drivers/mtd/ar7part.c
drivers/mtd/cmdlinepart.c
drivers/mtd/mtdsuper.c
drivers/mtd/nand/cafe_nand.c
drivers/mtd/nand/cmx270_nand.c
drivers/mtd/nand/diskonchip.c
drivers/mtd/nand/nand_bbt.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/onenand_bbt.c
drivers/mtd/redboot.c
drivers/net/ethernet/mellanox/mlx4/alloc.c
drivers/net/ethernet/mellanox/mlx4/catas.c
drivers/net/ethernet/mellanox/mlx4/cmd.c
drivers/net/ethernet/mellanox/mlx4/cq.c
drivers/net/ethernet/mellanox/mlx4/eq.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/intf.c
drivers/net/ethernet/mellanox/mlx4/mr.c
drivers/net/ethernet/mellanox/mlx4/pd.c
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/mellanox/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/srq.c
drivers/pci/hotplug/pcihp_slot.c
drivers/pci/setup-res.c
drivers/power/max17042_battery.c
drivers/power/max8903_charger.c
drivers/power/max8997_charger.c
drivers/power/max8998_charger.c
drivers/power/power_supply_sysfs.c
drivers/regulator/88pm8607.c
drivers/regulator/tps6586x-regulator.c
drivers/rtc/interface.c
drivers/s390/cio/qdio_debug.c
drivers/s390/scsi/zfcp_dbf.c
drivers/s390/scsi/zfcp_scsi.c
drivers/scsi/device_handler/scsi_dh.c
drivers/scsi/device_handler/scsi_dh_alua.c
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_lport.c
drivers/scsi/libsas/sas_scsi_host.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_scsi.c
drivers/ssb/main.c
drivers/staging/brcm80211/brcmutil/wifi.c
drivers/staging/iio/industrialio-ring.c
drivers/tty/serial/jsm/jsm_driver.c
drivers/tty/serial/max3107-aava.c
drivers/tty/serial/max3107.c
drivers/uio/uio_pdrv_genirq.c
drivers/usb/core/driver.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/file_storage.c
drivers/usb/gadget/fusb300_udc.c
drivers/usb/host/xhci-hub.c
drivers/usb/wusbcore/wa-hc.c
drivers/video/atmel_lcdfb.c
drivers/video/backlight/ep93xx_bl.c
drivers/video/carminefb.c
drivers/video/mb862xx/mb862xxfbdrv.c
drivers/video/msm/mdp.c
drivers/video/sh_mobile_lcdcfb.c
drivers/w1/w1_family.c
drivers/xen/balloon.c
drivers/xen/swiotlb-xen.c
drivers/xen/xen-selfballoon.c
drivers/xen/xenbus/xenbus_probe.c
fs/exofs/super.c
fs/gfs2/ops_fstype.c
fs/jfs/jfs_logmgr.c
fs/logfs/super.c
include/linux/bcma/bcma.h
include/linux/blkdev.h
include/linux/device.h
include/linux/dmaengine.h
include/linux/hid.h
include/linux/mtd/mtd.h
include/linux/pm_runtime.h
include/linux/usb.h
include/net/lib80211.h
include/net/sock.h
kernel/cgroup_freezer.c
kernel/crash_dump.c
kernel/cred.c
kernel/exit.c
kernel/fork.c
kernel/freezer.c
kernel/kthread.c
kernel/lockdep.c
kernel/pid.c
kernel/power/hibernate.c
kernel/power/main.c
kernel/power/suspend.c
kernel/rcupdate.c
kernel/rcutiny.c
kernel/rcutorture.c
kernel/rcutree.c
kernel/rcutree_trace.c
kernel/rtmutex.c
kernel/sched.c
kernel/signal.c
kernel/sys.c
kernel/trace/blktrace.c
lib/dma-debug.c
mm/memcontrol.c
mm/swapfile.c
sound/core/control.c
sound/usb/midi.c