git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

author	Grant Likely <grant.likely@secretlab.ca>
	Sat, 22 May 2010 06:36:56 +0000 (00:36 -0600)
committer	Grant Likely <grant.likely@secretlab.ca>
	Sat, 22 May 2010 06:36:56 +0000 (00:36 -0600)
commit	cf9b59e9d3e008591d1f54830f570982bb307a0d
tree	113478ce8fd8c832ba726ffdf59b82cb46356476	tree \| snapshot
parent	44504b2bebf8b5823c59484e73096a7d6574471d	commit \| diff
parent	f4b87dee923342505e1ddba8d34ce9de33e75050	commit \| diff

Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

52 files changed:

arch/powerpc/kernel/vio.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/time_32.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_macio.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_mpc52xx.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/talitos.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/fsldma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ppc4xx/adma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/pca953x.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-cpm.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-ibm_iic.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-mpc.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/smu.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/physmap_of.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_elbc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_upm.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pasemi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/socrates_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mpc5xxx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000_of_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec_mpc52xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-fcc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-scc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fsl_pq_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/greth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ll_temac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri_sbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunbmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunhme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunlance.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunqe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xilinx_emaclite.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/sbus/char/flash.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvfc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/mpc52xx_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/pmac_zilog.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sunzilog.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/uartlite.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi_mpc8xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/fhci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/isp1760-if.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c.h	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver

RSS Atom

arch/powerpc/kernel/vio.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/time_32.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_macio.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_mpc52xx.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/talitos.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/fsldma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ppc4xx/adma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/pca953x.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-cpm.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-ibm_iic.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-mpc.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/smu.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/physmap_of.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_elbc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_upm.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pasemi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/socrates_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/mscan/mpc5xxx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/sja1000/sja1000_of_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec_mpc52xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-fcc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/mac-scc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fsl_pq_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/greth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ll_temac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri_sbus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/niu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunbmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunhme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunlance.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sunqe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xilinx_emaclite.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
drivers/sbus/char/flash.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvfc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/mpc52xx_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/pmac_zilog.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sunzilog.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/uartlite.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi_mpc8xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/fhci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/isp1760-if.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/i2c.h	diff1 \|	diff2 \|	blob \| history