]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:38:34 +0000 (13:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:38:34 +0000 (13:38 +1000)
commitf8fb4431a98120d6e8b883a4b70a2e9d6a7a0cb1
tree2cb374eb7c5eccd0e67fe55da8842a8e495db0fe
parent0a3b286e0f800f2fa126e39e847c3ea448828e70
parent527a1361387cd132a577dc8a6ae676cfc1e8414b
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/scsi/ipr.c
30 files changed:
Documentation/dontdiff
drivers/dma/at_hdmac.c
drivers/dma/imx-dma.c
drivers/mfd/ab8500-gpadc.c
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/vub300.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/scsi/bfa/bfa_ioc.c
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/ipr.c
drivers/scsi/isci/host.c
drivers/scsi/isci/init.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/megaraid.c
drivers/scsi/qla4xxx/ql4_os.c
drivers/video/exynos/exynos_mipi_dsi.c
drivers/w1/masters/ds1wm.c
fs/btrfs/ctree.h
fs/btrfs/inode.c
fs/ext2/balloc.c
fs/ext3/balloc.c
fs/ext3/inode.c
fs/ext4/inode.c
fs/ext4/mballoc.c
fs/nfs/super.c
include/linux/irqdesc.h
tools/perf/util/parse-events-test.c
tools/perf/util/python-ext-sources