]> 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, 6 Sep 2012 03:22:52 +0000 (13:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:22:52 +0000 (13:22 +1000)
commitb1863158d379e0414c251ea9913d5551c47d867b
treedb14bfc5eaa301904a7121ffc4619fec577a5c27
parent985ee001227c1852802243d1a3286ab6f666eea7
parentca1868309be96eb905a71174187a190543a1b90e
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/scsi/ipr.c
29 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/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