]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'moduleh/module.h-split'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 03:39:57 +0000 (13:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 03:40:14 +0000 (13:40 +1000)
commit3d59eddeee79351160f11e7c4f76aa73e83c7322
tree56830b0ed65e7f742dfca6d8b468abbd17e3768e
parentfb98684e7197dac2ad05f408e989684ca0b92881
parent3e8e5642c4e67314606f10c67046c257a40b04e0
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
include/linux/dmaengine.h
95 files changed:
arch/arm/common/scoop.c
arch/arm/kernel/setup.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-ixp2000/core.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mach-msm/io.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-orion5x/dns323-setup.c
arch/mips/bcm47xx/gpio.c
arch/mips/bcm47xx/setup.c
arch/mips/kernel/traps.c
arch/x86/kernel/cpu/amd.c
block/bsg-lib.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/hid/hid-axff.c
drivers/hid/hid-debug.c
drivers/hid/hid-sjoy.c
drivers/hid/usbhid/hid-quirks.c
drivers/input/input-polldev.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/md/raid5.c
drivers/mmc/core/host.c
drivers/mmc/host/sdhci-tegra.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/max8997_charger.c
drivers/power/max8998_charger.c
drivers/regulator/88pm8607.c
drivers/rtc/interface.c
drivers/s390/cio/qdio_debug.c
drivers/video/atmel_lcdfb.c
drivers/video/carminefb.c
drivers/video/mb862xx/mb862xxfbdrv.c
drivers/video/msm/mdp.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/logfs/super.c
include/linux/bcma/bcma.h
include/linux/blkdev.h
include/linux/dmaengine.h
include/linux/hid.h
include/linux/mtd/mtd.h
include/net/lib80211.h
kernel/lockdep.c
kernel/pid.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/sched.c
kernel/trace/blktrace.c
mm/swapfile.c