rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commit

]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commit

projects / vajnamar / linux-xlnx.git / commit

author	Michal Simek <michal.simek@xilinx.com>
	Wed, 3 Jul 2013 10:40:42 +0000 (12:40 +0200)
committer	Michal Simek <michal.simek@xilinx.com>
	Fri, 12 Jul 2013 08:07:35 +0000 (10:07 +0200)
commit	106a1dc8416d3b09d496855d648bd107ec8682ac
tree	636c770743349739541f8aa9556916f4eb7692bb	tree \| snapshot
parent	669ee45083e22963d7fb7b774c5d7893ed35de2e	commit \| diff
parent	8bb495e3f02401ee6f76d1b1d77f3ac9f079e376	commit \| diff

Merge tag 'v3.10' into master-next

Merge Linux 3.10 to our branch

Fix slcr, remoteproc and usb, defconfig update.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

95 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/xilinx_zynq_base_trd_defconfig	diff1 \|	\|	blob \| history
arch/arm/configs/xilinx_zynq_defconfig	diff1 \|	\|	blob \| history
arch/arm/kernel/machine_kexec.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/slcr.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/microblaze/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/microblaze/pci/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/head_44x.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/44x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/block/xsysace.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/zynq-cpufreq.c	diff1 \|	\|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/dma/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-xilinxps.c	diff1 \|	\|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/adv7604.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/m25p80.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nand_base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/ll_temac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_emaclite.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/vitesse.c	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/remoteproc_core.c	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/remoteproc_elf_loader.c	diff1 \|	diff2 \|	blob \| history
drivers/rpmsg/virtio_rpmsg_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-xilinx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/of_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/xilinx_uartps.c	diff1 \|	diff2 \|	blob \| history
drivers/uio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/xilinx_usbps_udc.c	diff1 \|	\|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-xilinx-usbps.c	diff1 \|	\|	blob \| history
drivers/usb/host/ehci.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-ulpi.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-zynq-usb.c	diff1 \|	\|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqchip/arm-gic.h	diff1 \|	diff2 \|	blob \| history
include/linux/remoteproc.h	diff1 \|	diff2 \|	blob \| history
include/linux/socket.h	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	diff1 \|	diff2 \|	blob \| history
include/media/v4l2-chip-ident.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/xilinx_zynq_base_trd_defconfig	diff1 \|	\|	blob \| history
arch/arm/configs/xilinx_zynq_defconfig	diff1 \|	\|	blob \| history
arch/arm/kernel/machine_kexec.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/slcr.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/microblaze/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/microblaze/pci/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/head_44x.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/44x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/block/xsysace.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/zynq-cpufreq.c	diff1 \|	\|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/dma/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-xilinxps.c	diff1 \|	\|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/i2c/adv7604.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/m25p80.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nand_base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/ll_temac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_emaclite.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/vitesse.c	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/remoteproc_core.c	diff1 \|	diff2 \|	blob \| history
drivers/remoteproc/remoteproc_elf_loader.c	diff1 \|	diff2 \|	blob \| history
drivers/rpmsg/virtio_rpmsg_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-xilinx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/8250_core.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/of_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/xilinx_uartps.c	diff1 \|	diff2 \|	blob \| history
drivers/uio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/xilinx_usbps_udc.c	diff1 \|	\|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-xilinx-usbps.c	diff1 \|	\|	blob \| history
drivers/usb/host/ehci.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-ulpi.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-zynq-usb.c	diff1 \|	\|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqchip/arm-gic.h	diff1 \|	diff2 \|	blob \| history
include/linux/remoteproc.h	diff1 \|	diff2 \|	blob \| history
include/linux/socket.h	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	diff1 \|	diff2 \|	blob \| history
include/media/v4l2-chip-ident.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history