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>
	Mon, 1 Aug 2011 03:08:55 +0000 (13:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 1 Aug 2011 03:22:34 +0000 (13:22 +1000)
commit	c39a889562d3bd708b23f203f01528987d44110d
tree	8108ed55036e5fad22cafbee94eaa4682d9b30ee	tree \| snapshot
parent	40cae88e4782b8a11c4b622dfa6867ac7e0ead63	commit \| diff
parent	2a4d428d1e1d9cfd22720ba07fc37a0531591285	commit \| diff

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

Conflicts:
drivers/dma/ste_dma40.c

57 files changed:

arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pmc-sierra/msp71xx/msp_setup.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
block/bsg-lib.c	diff1 \|	\|	blob \| history
drivers/acpi/ec_sys.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/intel_mid_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ipu/ipu_idmac.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-log-userspace-base.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-snap-persistent.c	diff1 \|	diff2 \|	blob \| history
drivers/md/persistent-data/dm-block-manager.c	diff1 \|	\|	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/mfd/ab3550-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/ab8500-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/mmc_test.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/host.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-pxav3.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-s3c.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci.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/onenand/onenand_bbt.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/redboot.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_cm_x255.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_cm_x270.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel_scu_ipc.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/msi-wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max17042_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max8903_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/dummy.c	diff1 \|	diff2 \|	blob \| history
drivers/video/atmel_lcdfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/carminefb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mb862xx/mb862xxfbdrv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/mtd/mtd.h	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/driver.h	diff1 \|	diff2 \|	blob \| history
kernel/debug/kdb/kdb_debugger.c	diff1 \|	diff2 \|	blob \| history
kernel/resource.c	diff1 \|	diff2 \|	blob \| history
mm/memory-failure.c	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/io.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/mips/pmc-sierra/msp71xx/msp_setup.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
block/bsg-lib.c	diff1 \|	\|	blob \| history
drivers/acpi/ec_sys.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/intel_mid_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ipu/ipu_idmac.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-log-userspace-base.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-raid.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-snap-persistent.c	diff1 \|	diff2 \|	blob \| history
drivers/md/persistent-data/dm-block-manager.c	diff1 \|	\|	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/mfd/ab3550-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/ab8500-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/mmc_test.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/host.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-pxav3.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-s3c.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci.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/onenand/onenand_bbt.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/redboot.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_cm_x255.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_cm_x270.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/intel_scu_ipc.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/msi-wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max17042_battery.c	diff1 \|	diff2 \|	blob \| history
drivers/power/max8903_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/dummy.c	diff1 \|	diff2 \|	blob \| history
drivers/video/atmel_lcdfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/carminefb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/mb862xx/mb862xxfbdrv.c	diff1 \|	diff2 \|	blob \| history
drivers/video/msm/mdp.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/mtd/mtd.h	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/driver.h	diff1 \|	diff2 \|	blob \| history
kernel/debug/kdb/kdb_debugger.c	diff1 \|	diff2 \|	blob \| history
kernel/resource.c	diff1 \|	diff2 \|	blob \| history
mm/memory-failure.c	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history