git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 03:32:23 +0000 (14:32 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 03:32:23 +0000 (14:32 +1100)
commit	616d2b463761e7b4c9133f20db1a09e576e5f607
tree	b2365292044eb0fc85db662935dd69a928614e8a	tree \| snapshot
parent	314c848e6910978f2fd7c623a0b241862085c203	commit \| diff
parent	6760235fa46763ddeef451be6f7e981422397316	commit \| diff

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/ide/Kconfig
drivers/net/Kconfig

55 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/laptops/thinkpad-acpi.txt	diff1 \|	diff2 \|	blob \| history
Documentation/networking/scaling.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/smartreflex.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/xcep.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/85xx/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/block/drbd/drbd_int.h	diff1 \|	diff2 \|	blob \| history
drivers/block/rbd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkback/common.h	diff1 \|	diff2 \|	blob \| history
drivers/ide/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb/dvb-usb/af9005.c	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/wl128x/fmdrv_v4l2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atlx/atl1.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/21142.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/interrupt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/media.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/pnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/pnic2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/timer.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/tulip.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/tulip_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/e1000_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igbvf/mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbevf/mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ks8695net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/tile/tilepro.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/isci/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_ctl.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_scsih.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mvsas/mv_sas.h	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_conf.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_io.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/locks.c	diff1 \|	diff2 \|	blob \| history
include/linux/ceph/messenger.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/laptops/thinkpad-acpi.txt	diff1 \|	diff2 \|	blob \| history
Documentation/networking/scaling.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/smartreflex.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/xcep.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/85xx/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/block/drbd/drbd_int.h	diff1 \|	diff2 \|	blob \| history
drivers/block/rbd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkback/common.h	diff1 \|	diff2 \|	blob \| history
drivers/ide/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb/dvb-usb/af9005.c	diff1 \|	diff2 \|	blob \| history
drivers/media/radio/wl128x/fmdrv_v4l2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atlx/atl1.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/21142.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/interrupt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/media.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/pnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/pnic2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/timer.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/tulip.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dec/tulip/tulip_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/e1000_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igbvf/mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbevf/mbx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ks8695net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/tile/tilepro.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/isci/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_ctl.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt2sas/mpt2sas_scsih.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mvsas/mv_sas.h	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_conf.c	diff1 \|	diff2 \|	blob \| history
drivers/target/tcm_fc/tfc_io.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/locks.c	diff1 \|	diff2 \|	blob \| history
include/linux/ceph/messenger.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	diff1 \|	diff2 \|	blob \| history