]> 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>
Fri, 29 Jul 2011 04:45:27 +0000 (14:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 04:45:27 +0000 (14:45 +1000)
commiteaa427a9d5f447c73da19bed31886b6ac1d7342d
treea720258990556d1971bd50be5e1787c74c182554
parentea58690c5158f8d9f18a2cbac0caad85f842ce63
parent5e52c90256af05ce0b27c7559b2b7b3e9d085546
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
sound/i2c/other/tea575x-tuner.c
90 files changed:
arch/arm/kernel/bios32.c
arch/arm/kernel/setup.c
arch/mips/kernel/traps.c
arch/sparc/kernel/cpu.c
arch/sparc/kernel/cpumap.c
arch/sparc/kernel/hvapi.c
arch/sparc/kernel/leon_pci_grpci2.c
arch/sparc/kernel/pcr.c
drivers/acpi/ec_sys.c
drivers/acpi/sysfs.c
drivers/dma/intel_mid_dma.c
drivers/input/keyboard/tnetv107x-keypad.c
drivers/input/touchscreen/ads7846.c
drivers/md/dm-log-userspace-base.c
drivers/md/dm-raid.c
drivers/md/dm-snap-persistent.c
drivers/md/md.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/media/common/tuners/tuner-types.c
drivers/media/radio/radio-timb.c
drivers/media/radio/radio-wl1273.c
drivers/media/radio/wl128x/fmdrv_v4l2.c
drivers/media/rc/ir-lirc-codec.c
drivers/media/rc/ir-raw.c
drivers/media/rc/keymaps/rc-rc6-mce.c
drivers/media/rc/rc-main.c
drivers/media/video/m5mols/m5mols_core.c
drivers/media/video/mt9m001.c
drivers/media/video/mt9m111.c
drivers/media/video/mt9t031.c
drivers/media/video/mt9v011.c
drivers/media/video/mt9v022.c
drivers/media/video/mt9v032.c
drivers/media/video/omap24xxcam.c
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
drivers/media/video/rj54n1cb0c.c
drivers/media/video/sh_mobile_csi2.c
drivers/media/video/sh_vou.c
drivers/media/video/sr030pc30.c
drivers/media/video/timblogiw.c
drivers/media/video/v4l2-ctrls.c
drivers/media/video/v4l2-device.c
drivers/media/video/v4l2-event.c
drivers/media/video/v4l2-fh.c
drivers/media/video/v4l2-subdev.c
drivers/mfd/ab3550-core.c
drivers/mfd/ab8500-debugfs.c
drivers/mfd/twl-core.c
drivers/mmc/card/mmc_test.c
drivers/mmc/core/host.c
drivers/mmc/core/mmc.c
drivers/mmc/host/sdhci.c
drivers/mtd/ar7part.c
drivers/mtd/cmdlinepart.c
drivers/mtd/mtdsuper.c
drivers/mtd/nand/cafe_nand.c
drivers/mtd/nand/diskonchip.c
drivers/mtd/nand/nand_bbt.c
drivers/mtd/onenand/onenand_bbt.c
drivers/mtd/redboot.c
drivers/pci/setup-res.c
drivers/platform/x86/intel_scu_ipc.c
drivers/platform/x86/msi-wmi.c
drivers/power/max17042_battery.c
drivers/power/max8903_charger.c
drivers/regulator/dummy.c
drivers/scsi/bfa/bfad_im.c
drivers/scsi/device_handler/scsi_dh_rdac.c
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_lport.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/lpfc/lpfc_debugfs.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_scsi.c
drivers/scsi/scsi_lib.c
drivers/video/carminefb.c
drivers/video/mb862xx/mb862xxfbdrv.c
drivers/xen/xen-selfballoon.c
fs/gfs2/ops_fstype.c
include/linux/mtd/mtd.h
include/linux/regulator/driver.h
kernel/compat.c
kernel/resource.c
kernel/signal.c
mm/memory-failure.c
mm/swapfile.c
sound/i2c/other/tea575x-tuner.c
sound/pci/asihpi/hpioctl.c