Grant Likely cf9b59e9d3 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>

2010-05-22 00:36:56 -06:00

..

i2c-acorn.c

…

i2c-ali15x3.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-ali1535.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-ali1563.c

i2c: Make PCI device ids constant

2010-03-02 12:23:37 +01:00

i2c-amd756-s4882.c

…

i2c-amd756.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-amd8111.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-at91.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-au1550.c

…

i2c-bfin-twi.c

i2c-bfin-twi: return completion in interrupt for smbus quick transfers

2010-05-20 00:18:58 +01:00

i2c-cpm.c

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

2010-05-22 00:36:56 -06:00

i2c-davinci.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i2c-designware.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i2c-elektor.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-gpio.c

i2c-gpio: Move initialization code to subsys_initcall()

2010-05-21 18:40:58 +02:00

i2c-highlander.c

i2c-highlander: remover superflous variable

2010-05-20 00:19:01 +01:00

i2c-hydra.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-i801.c

i2c-i801: Fix all checkpatch warnings

2010-05-21 18:40:55 +02:00

i2c-ibm_iic.c

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

2010-05-22 00:36:56 -06:00

i2c-ibm_iic.h

…

i2c-imx.c

i2c-imx: fix error handling

2010-04-20 01:16:57 +01:00

i2c-iop3xx.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-iop3xx.h

…

i2c-isch.c

i2c: convert i2c-isch to platform_device

2010-03-07 22:17:36 +01:00

i2c-ixp2000.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i2c-mpc.c

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

2010-05-22 00:36:56 -06:00

i2c-mv64xxx.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-nforce2-s4985.c

…

i2c-nforce2.c

i2c-nforce2: Remove redundant error messages on ACPI conflict

2010-05-21 18:41:01 +02:00

i2c-nomadik.c

i2c-nomadik: fix operator precedence warning

2010-05-20 00:19:00 +01:00

i2c-ocores.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-octeon.c

I2C: Fix section mismatch errors in i2c-octeon.c

2010-04-30 20:52:52 +01:00

i2c-omap.c

OMAP3: I2C: Clean up Errata 1p153 handling

2010-05-20 00:19:00 +01:00

i2c-parport-light.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-parport.c

i2c-parport: Make template structure const

2010-05-21 18:40:57 +02:00

i2c-parport.h

i2c-parport: Add SMBus alert support

2010-03-02 12:23:44 +01:00

i2c-pasemi.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-pca-isa.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-pca-platform.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-piix4.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-pmcmsp.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-pnx.c

i2c-pnx: Add stop conditions for end of transfer

2010-04-20 01:16:57 +01:00

i2c-powermac.c

i2c-powermac: Be less verbose in the absence of real errors.

2010-03-13 20:56:52 +01:00

i2c-pxa.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-s3c2410.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-s6000.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-s6000.h

…

i2c-scmi.c

i2c-scmi: Provide module aliases for automatic loading

2010-03-24 14:38:39 +01:00

i2c-sh7760.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-sh_mobile.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i2c-sibyte.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-simtec.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-sis96x.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-sis630.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-sis5595.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-stu300.c

i2c-stu300: off by one issue

2010-04-20 01:17:13 +01:00

i2c-stub.c

i2c-stub: Expose the default functionality flags

2010-05-21 18:40:56 +02:00

i2c-taos-evm.c

…

i2c-tiny-usb.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i2c-versatile.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-via.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-viapro.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

i2c-xiic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

ARM: Add Versatile Express support

2010-05-02 09:35:38 +01:00

Makefile

i2c: Add support for Xilinx XPS IIC Bus Interface

2010-03-07 22:28:39 +00:00

scx200_acb.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00

scx200_i2c.c

i2c: Use <linux/io.h> instead of <asm/io.h>

2010-05-21 18:41:01 +02:00