]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c86e28e fcb0473)
Merge remote-tracking branch 'moduleh/module.h-split'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 03:51:48 +0000 (13:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 04:08:02 +0000 (14:08 +1000)
commit9a71ab25997d94bdeac197b5b5567be39c53e060
treec2eb0f4a1d1dc8de695e0caa6850ab419eeab13etree | snapshot
parentc86e28ec3062f1f62cfc7021a773975d6773a993commit | diff
parentfcb04737293b639a7fba9923e3f9c79b037cbc76commit | diff
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
drivers/dma/ste_dma40.c
drivers/staging/dt3155v4l/dt3155v4l.c
80 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/arm/mach-omap2/display.c diff1 | diff2 | blob | history
arch/mips/kernel/traps.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/md.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/raid5.c diff1 | diff2 | 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.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/pci/hotplug/pcihp_slot.c diff1 | diff2 | blob | history
drivers/pci/setup-res.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/power/max8997_charger.c diff1 | | blob | history
drivers/power/max8998_charger.c diff1 | | blob | history
drivers/regulator/aat2870-regulator.c diff1 | | blob | history
drivers/regulator/dummy.c diff1 | diff2 | blob | history
drivers/staging/dt3155v4l/dt3155v4l.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16203_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16204_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16209_core.c diff1 | diff2 | blob | history
drivers/staging/iio/accel/adis16240_core.c diff1 | diff2 | blob | history
drivers/staging/iio/gyro/adis16260_core.c diff1 | diff2 | blob | history
drivers/usb/gadget/composite.c diff1 | diff2 | blob | history
drivers/usb/gadget/fusb300_udc.c diff1 | diff2 | blob | history
drivers/usb/host/pci-quirks.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
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/omap2/omapfb/omapfb-ioctl.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
sound/pci/asihpi/hpioctl.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules