]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 06:44:56 +0000 (16:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 06:44:56 +0000 (16:44 +1000)
commit49d07ebe3e84299574275e0aeb0dfa32eb00ede0
treee6803327c5531795d7044e1de536bc84b96f6558
parent2017963e76ad7f373674389c108782811b0c7551
parent535cc9dc3a2bad73a006f124c35f07d8edfcf8c5
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
42 files changed:
Documentation/kernel-parameters.txt
Documentation/laptops/thinkpad-acpi.txt
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/mach-omap2/smartreflex.c
arch/arm/mach-pxa/xcep.c
drivers/block/drbd/drbd_int.h
drivers/block/rbd.c
drivers/block/xen-blkback/common.h
drivers/mtd/Kconfig
drivers/net/ethernet/atheros/atlx/atl1.c
drivers/net/ethernet/broadcom/bnx2.h
drivers/net/ethernet/dec/tulip/21142.c
drivers/net/ethernet/dec/tulip/eeprom.c
drivers/net/ethernet/dec/tulip/interrupt.c
drivers/net/ethernet/dec/tulip/media.c
drivers/net/ethernet/dec/tulip/pnic.c
drivers/net/ethernet/dec/tulip/pnic2.c
drivers/net/ethernet/dec/tulip/timer.c
drivers/net/ethernet/dec/tulip/tulip.h
drivers/net/ethernet/dec/tulip/tulip_core.c
drivers/net/ethernet/intel/igb/e1000_mbx.c
drivers/net/ethernet/intel/igbvf/mbx.c
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
drivers/net/ethernet/intel/ixgbevf/mbx.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/micrel/ks8695net.c
drivers/net/ethernet/tile/tilepro.c
drivers/net/wireless/rtlwifi/pci.c
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/target/target_core_transport.c
drivers/target/tcm_fc/tfc_cmd.c
drivers/target/tcm_fc/tfc_conf.c
drivers/target/tcm_fc/tfc_io.c
fs/cifs/connect.c
fs/locks.c
include/linux/ceph/messenger.h
kernel/sched.c
lib/Kconfig.debug