git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Sep 2011 08:09:49 +0000 (18:09 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Sep 2011 08:10:05 +0000 (18:10 +1000)
commit	3a87c672758022c53b25825a1f8b1cb825d9fc79
tree	1dbab9c4d119c11300dc554a9c3c649e61d331bc	tree \| snapshot
parent	fa77dc32e68073d2b890d206e0079cf7e8ab9c89	commit \| diff
parent	25215aa319f0bd032840e6f509d490e919e7234c	commit \| diff

Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
arch/arm/mach-bcmring/mm.c
arch/powerpc/mm/tlb_nohash.c
drivers/s390/char/vmur.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h

252 files changed:

arch/arm/common/scoop.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/armksyms.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-bcmring/mm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm646x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp2000/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common-pci.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clockdomain.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/display.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/voltage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2410/mach-h1940.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/jornada720.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/dev-ts.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/platformdata.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-bf518/boards/ezbrd.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-bf527/boards/ad7160eval.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-bf527/boards/ezkit.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-bf527/boards/tll6527m.c	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-bf537/boards/dnp5370.c	diff1 \|	diff2 \|	blob \| history
arch/mips/bcm47xx/gpio.c	diff1 \|	diff2 \|	blob \| history
arch/mips/bcm47xx/setup.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/vpe.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/machdep.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/dma-iommu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/dma.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/ibmebus.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/vio.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/hash_utils_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mmu_context_hash64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb_nohash.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/ps3/system-bus.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/eeh.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/iommu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/lpar.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_rio.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/pcic.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
block/bsg-lib.c	diff1 \|	\|	blob \| history
block/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-eh.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/common.c	diff1 \|	\|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/runtime.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/core.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_chipcommon.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_chipcommon_pmu.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/driver_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/block/ps3vram.c	diff1 \|	diff2 \|	blob \| history
drivers/char/virtio_console.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_cmt.c	diff1 \|	diff2 \|	blob \| history
drivers/dca/dca-core.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/intel_mid_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/google/gsmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-ep93xx.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-mxc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-mxs.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-axff.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-debug.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-picolcd.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sjoy.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-pxa-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/input/input-mt.c	diff1 \|	diff2 \|	blob \| history
drivers/input/input-polldev.c	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/ad714x.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/leds-asic3.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid.c	diff1 \|	diff2 \|	blob \| history
drivers/md/faulty.c	diff1 \|	diff2 \|	blob \| history
drivers/md/linear.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/multipath.c	diff1 \|	diff2 \|	blob \| history
drivers/md/persistent-data/dm-btree-remove.c	diff1 \|	\|	blob \| history
drivers/md/persistent-data/dm-btree.c	diff1 \|	\|	blob \| history
drivers/md/persistent-data/dm-space-map-disk.c	diff1 \|	\|	blob \| history
drivers/md/persistent-data/dm-transaction-manager.c	diff1 \|	\|	blob \| history
drivers/md/raid0.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid10.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/wl128x/fmdrv_v4l2.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/ab3550-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/asic3.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/max8997.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl6030-irq.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/wm8400-core.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/ab8500-pwm.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/ti-st/st_kim.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/host.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/mmc_ops.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/sd_ops.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sh_mobile_sdhi.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/ar7part.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cmdlinepart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdsuper.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/cafe_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/cmx270_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/diskonchip.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nand_bbt.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/sm_common.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/onenand_bbt.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/redboot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/alloc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/catas.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/cq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/intf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/pd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/srq.c	diff1 \|	diff2 \|	blob \| history
drivers/parisc/sba_iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/hotplug/pcihp_slot.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/setup-res.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max17042_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max8903_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max8997_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max8998_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/power/power_supply_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/88pm8607.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/mc13783-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps6586x-regulator.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/interface.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/char/vmur.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/cio/qdio_debug.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/scsi/zfcp_dbf.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/scsi/zfcp_scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/device_handler/scsi_dh_alua.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_exch.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_lport.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libsas/sas_scsi_host.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_attr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_init.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_mbox.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-dw.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmutil/wifi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/jsm/jsm_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/max3107-aava.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/max3107.c	diff1 \|	diff2 \|	blob \| history
drivers/uio/uio_pdrv_genirq.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/composite.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/file_storage.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/fusb300_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/wusbcore/wa-hc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/atmel_lcdfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/ep93xx_bl.c	diff1 \|	diff2 \|	blob \| history
drivers/video/carminefb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mb862xx/mb862xx-i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mb862xx/mb862xxfbdrv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dispc.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dpi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dss.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/rfbi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/sdi.c	diff1 \|	diff2 \|	blob \| history
drivers/video/sh_mobile_lcdcfb.c	diff1 \|	diff2 \|	blob \| history
drivers/w1/w1_family.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/balloon.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/swiotlb-xen.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/xen-selfballoon.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/xenbus/xenbus_probe.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/xenbus/xenbus_probe_frontend.c	diff1 \|	diff2 \|	blob \| history
fs/exofs/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/ops_fstype.c	diff1 \|	diff2 \|	blob \| history
fs/logfs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/bcma/bcma.h	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/dmaengine.h	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	blob \| history
include/linux/mtd/mtd.h	diff1 \|	diff2 \|	blob \| history
include/linux/pm_runtime.h	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/ssb/ssb.h	diff1 \|	diff2 \|	blob \| history
include/linux/usb.h	diff1 \|	diff2 \|	blob \| history
include/net/lib80211.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/async.c	diff1 \|	diff2 \|	blob \| history
kernel/crash_dump.c	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/futex.c	diff1 \|	diff2 \|	blob \| history
kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
kernel/latencytop.c	diff1 \|	diff2 \|	blob \| history
kernel/lockdep.c	diff1 \|	diff2 \|	blob \| history
kernel/pid.c	diff1 \|	diff2 \|	blob \| history
kernel/power/main.c	diff1 \|	diff2 \|	blob \| history
kernel/power/suspend.c	diff1 \|	diff2 \|	blob \| history
kernel/rcupdate.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutiny.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutorture.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutree.c	diff1 \|	diff2 \|	blob \| history
kernel/rcutree_trace.c	diff1 \|	diff2 \|	blob \| history
kernel/rtmutex-debug.c	diff1 \|	diff2 \|	blob \| history
kernel/rtmutex.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/semaphore.c	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/blktrace.c	diff1 \|	diff2 \|	blob \| history
kernel/watchdog.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
lib/dma-debug.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history
security/selinux/netlink.c	diff1 \|	diff2 \|	blob \| history
sound/core/control.c	diff1 \|	diff2 \|	blob \| history
sound/drivers/mpu401/mpu401.c	diff1 \|	diff2 \|	blob \| history
sound/drivers/mpu401/mpu401_uart.c	diff1 \|	diff2 \|	blob \| history
sound/pci/als4000.c	diff1 \|	diff2 \|	blob \| history
sound/usb/midi.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom