]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ace77c 74fef7a)
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:25:06 +0000 (15:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 04:25:06 +0000 (15:25 +1100)
commit6801d6523358ccda0280ebf47764ed828b74195a
treef1f0f72c0db2aebf437070fb26d0c99685825bd1tree | snapshot
parent4ace77cbc0e57c25a6f748787b3c9e4b506c4064commit | diff
parent74fef7a8fd1d2bd94f925d6638bb4c3049e7c381commit | diff
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
drivers/acpi/Kconfig
drivers/dma/dw_dmac.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/iommu/tegra-smmu.c
drivers/net/ethernet/8390/Kconfig
drivers/net/ethernet/fujitsu/Kconfig
drivers/net/ethernet/i825xx/Kconfig
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/racal/Kconfig
drivers/net/ethernet/seeq/Kconfig
drivers/net/wan/Kconfig
drivers/net/wireless/rtlwifi/Kconfig
drivers/spi/Kconfig
drivers/spi/spi-s3c64xx.c
drivers/vhost/Kconfig
drivers/vhost/Kconfig.tcm
net/wanrouter/Kconfig
83 files changed:
Documentation/DocBook/kernel-hacking.tmpl diff1 | diff2 | blob | history
arch/alpha/Kconfig diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/blackfin/Kconfig diff1 | diff2 | blob | history
arch/ia64/Kconfig diff1 | diff2 | blob | history
arch/mips/Kconfig diff1 | diff2 | blob | history
arch/parisc/Kconfig diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
arch/powerpc/platforms/85xx/Kconfig diff1 | diff2 | blob | history
arch/s390/Kconfig diff1 | diff2 | blob | history
arch/sh/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
crypto/Kconfig diff1 | diff2 | blob | history
drivers/acpi/Kconfig diff1 | diff2 | blob | history
drivers/ata/Kconfig diff1 | diff2 | blob | history
drivers/cpufreq/Kconfig.arm diff1 | diff2 | blob | history
drivers/cpufreq/Kconfig.x86 diff1 | diff2 | blob | history
drivers/dma/dw_dmac.c diff1 | diff2 | blob | history
drivers/dma/mmp_pdma.c diff1 | diff2 | blob | history
drivers/dma/tegra20-apb-dma.c diff1 | diff2 | blob | history
drivers/gpio/Kconfig diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_drm_g2d.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_drm_rotator.c diff1 | diff2 | blob | history
drivers/gpu/drm/exynos/exynos_hdmi.c diff1 | diff2 | blob | history
drivers/i2c/busses/Kconfig diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-at91.c diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-s3c2410.c diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-tegra.c diff1 | diff2 | blob | history
drivers/ide/Kconfig diff1 | diff2 | blob | history
drivers/iommu/Kconfig diff1 | diff2 | blob | history
drivers/iommu/tegra-smmu.c diff1 | diff2 | blob | history
drivers/leds/Kconfig diff1 | diff2 | blob | history
drivers/media/Kconfig diff1 | diff2 | blob | history
drivers/media/platform/Kconfig diff1 | diff2 | blob | history
drivers/media/usb/dvb-usb-v2/Kconfig diff1 | diff2 | blob | history
drivers/misc/atmel-ssc.c diff1 | diff2 | blob | history
drivers/mmc/host/Kconfig diff1 | diff2 | blob | history
drivers/mmc/host/mxs-mmc.c diff1 | diff2 | blob | history
drivers/mmc/host/sdhci-s3c.c diff1 | diff2 | blob | history
drivers/mtd/Kconfig diff1 | diff2 | blob | history
drivers/mtd/devices/Kconfig diff1 | diff2 | blob | history
drivers/mtd/nand/fsmc_nand.c diff1 | diff2 | blob | history
drivers/mtd/nand/mxc_nand.c diff1 | diff2 | blob | history
drivers/net/ethernet/8390/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/fujitsu/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/i825xx/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/intel/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/seeq/Kconfig diff1 | diff2 | blob | history
drivers/net/wan/Kconfig diff1 | diff2 | blob | history
drivers/pinctrl/pinctrl-exynos5440.c diff1 | diff2 | blob | history
drivers/pinctrl/pinctrl-nomadik.c diff1 | diff2 | blob | history
drivers/platform/x86/Kconfig diff1 | diff2 | blob | history
drivers/remoteproc/Kconfig diff1 | diff2 | blob | history
drivers/scsi/Kconfig diff1 | diff2 | blob | history
drivers/scsi/scsi_transport_iscsi.c diff1 | diff2 | blob | history
drivers/spi/Kconfig diff1 | diff2 | blob | history
drivers/spi/spi-ep93xx.c diff1 | diff2 | blob | history
drivers/spi/spi-mxs.c diff1 | diff2 | blob | history
drivers/spi/spi-omap2-mcspi.c diff1 | diff2 | blob | history
drivers/spi/spi-s3c64xx.c diff1 | diff2 | blob | history
drivers/spi/spi-sirf.c diff1 | diff2 | blob | history
drivers/spi/spi-tegra20-sflash.c diff1 | diff2 | blob | history
drivers/spi/spi-tegra20-slink.c diff1 | diff2 | blob | history
drivers/spi/spi.c diff1 | diff2 | blob | history
drivers/thermal/exynos_thermal.c diff1 | diff2 | blob | history
drivers/tty/tty_io.c diff1 | diff2 | blob | history
drivers/vhost/Kconfig diff1 | diff2 | blob | history
drivers/vhost/Kconfig.tcm diff1 | diff2 | blob | history
drivers/video/Kconfig diff1 | diff2 | blob | history
drivers/video/exynos/exynos_dp_core.c diff1 | diff2 | blob | history
drivers/watchdog/at91sam9_wdt.c diff1 | diff2 | blob | history
drivers/watchdog/pnx4008_wdt.c diff1 | diff2 | blob | history
include/linux/power_supply.h diff1 | diff2 | blob | history
include/linux/printk.h diff1 | diff2 | blob | history
include/linux/rtc.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
net/Kconfig diff1 | diff2 | blob | history
net/mac80211/Kconfig diff1 | diff2 | blob | history
net/netfilter/Kconfig diff1 | diff2 | blob | history
net/nfc/core.c diff1 | diff2 | blob | history
sound/soc/fsl/imx-audmux.c diff1 | diff2 | blob | history
sound/soc/mxs/mxs-saif.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules