Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/drivers/i2c/busses
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
i2c-acorn.c [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00:00
i2c-ali15x3.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-ali1535.c i2c-ali1535: Fix style issues 2011-07-25 17:49:42 +02:00
i2c-ali1563.c i2c: Make PCI device ids constant 2010-03-02 12:23:37 +01:00
i2c-amd756-s4882.c i2c: Use snprintf to set adapter names 2009-01-07 14:29:18 +01:00
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-amd8111: Add proper error handling 2010-10-24 18:16:58 +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 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
i2c-bfin-twi.c i2c: irq: Remove IRQF_DISABLED 2011-10-29 09:55:45 +01:00
i2c-cpm.c i2c: Allow i2c_add_numbered_adapter() to assign a bus id 2011-07-25 17:49:43 +02:00
i2c-davinci.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-designware-core.c i2c-designware: Add runtime power management support 2011-10-29 11:03:53 +01:00
i2c-designware-core.h i2c-designware: Add runtime power management support 2011-10-29 11:03:53 +01:00
i2c-designware-pcidrv.c i2c-designware: Fix PCI core warning on suspend/resume 2011-10-29 11:03:53 +01:00
i2c-designware-platdrv.c i2c-designware: Push all register reads/writes into the core code. 2011-10-29 11:03:51 +01:00
i2c-diolan-u2c.c USB: convert some miscellanies drivers to use module_usb_driver() 2011-11-18 09:52:10 -08:00
i2c-eg20t.c i2c-eg20t: correct the driver init order of pch_i2c_probe() 2011-12-18 11:46:42 +00:00
i2c-elektor.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-gpio.c Haavard Skinnemoen has left Atmel 2011-05-18 23:24:50 +02:00
i2c-highlander.c i2c: irq: Remove IRQF_DISABLED 2011-10-29 09:55:45 +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: Don't depend on other kernel driver config options 2011-05-24 20:58:49 +02:00
i2c-ibm_iic.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-ibm_iic.h
i2c-imx.c i2c-imx: add device tree probe support 2011-09-14 22:16:14 +01:00
i2c-intel-mid.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-iop3xx.c i2c-iop3xx: add iomem annotation 2011-01-04 00:53:37 +00:00
i2c-iop3xx.h i2c-iop3xx: add iomem annotation 2011-01-04 00:53:37 +00:00
i2c-isch.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-ixp2000.c ARM: 7043/1: mach-ixp2000: rename GPIO header 2011-08-22 09:13:21 +01:00
i2c-mpc.c drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
i2c-mv64xxx.c i2c-mv64xxx: send repeated START between messages in xfer 2011-01-04 01:19:43 +00:00
i2c-mxs.c Fix common misspellings 2011-03-31 11:26:23 -03:00
i2c-nforce2-s4985.c
i2c-nforce2.c i2c-nforce2: Remove unnecessary cast of pci_get_drvdata 2011-01-10 22:11:22 +01:00
i2c-nomadik.c Merge branches 'for-32/i2c/nomadik', 'for-32/i2c/s3c2410-dt' and 'for-32/i2c/tegra-iomem' into for-linus/i2c-3.2 2011-11-01 00:54:17 +00:00
i2c-nuc900.c ARM: 7175/1: add subname parameter to mfp_set_groupg callers 2011-11-26 21:58:54 +00:00
i2c-ocores.c mfd: Use mfd cell platform_data for timberdale cells platform bits 2011-05-26 19:45:05 +02:00
i2c-octeon.c i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout 2010-09-27 23:21:16 +01:00
i2c-omap.c I2C: OMAP: fix FIFO usage for OMAP4 2011-12-18 11:45:54 +00:00
i2c-parport-light.c i2c-parport: Various cleanups 2011-05-24 20:58:49 +02:00
i2c-parport.c i2c-parport: Various cleanups 2011-05-24 20:58:49 +02:00
i2c-parport.h i2c-parport: Various cleanups 2011-05-24 20:58:49 +02:00
i2c-pasemi.c i2c/i2c-pasemi.c: Fix unsigned return type 2010-10-13 16:19:04 +11:00
i2c-pca-isa.c i2c-pca: Fix waitforcompletion() return value 2010-09-30 14:14:22 +02:00
i2c-pca-platform.c i2c-pca-platform: Change device name of request_irq 2010-10-24 18:16:57 +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: irq: Remove IRQF_DISABLED 2011-10-29 09:55:45 +01:00
i2c-pnx.c i2c: pnx: Fix crash due to wrong init of timer->data 2011-05-13 00:10:36 +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-puv3.c unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc 2011-03-17 09:19:20 +08:00
i2c-pxa-pci.c i2c: Add module.h to modular files prev. implicitly getting it 2011-10-31 19:31:29 -04:00
i2c-pxa.c i2c: Allow i2c_add_numbered_adapter() to assign a bus id 2011-07-25 17:49:43 +02:00
i2c-s3c2410.c i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio 2011-12-18 11:44:49 +00:00
i2c-s6000.c i2c: Allow i2c_add_numbered_adapter() to assign a bus id 2011-07-25 17:49:43 +02:00
i2c-s6000.h i2c: xtensa s6000 i2c driver 2009-04-07 10:23:34 +01:00
i2c-scmi.c i2c-scmi: Provide module aliases for automatic loading 2010-03-24 14:38:39 +01:00
i2c-sh7760.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
i2c-sh_mobile.c i2c: irq: Remove IRQF_DISABLED 2011-10-29 09:55:45 +01:00
i2c-sibyte.c i2c/mips: Fix error return codes from Sibyte i2c bus driver 2010-07-10 09:42:47 +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: irq: Remove IRQF_DISABLED 2011-10-29 09:55:45 +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-taos-evm: Fix log messages 2011-06-29 11:36:10 +02:00
i2c-tegra.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
i2c-tiny-usb.c USB: convert some miscellanies drivers to use module_usb_driver() 2011-11-18 09:52:10 -08: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-viapro: Don't log nacks 2010-10-24 18:16:59 +02:00
i2c-xiic.c mfd: Use mfd cell platform_data for timberdale cells platform bits 2011-05-26 19:45:05 +02:00
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
Makefile i2c-designware: Add support for Designware core behind PCI devices. 2011-10-29 11:03:52 +01:00
scx200_acb.c i2c/scx200_acb: Fix section mismatch warning in scx200_pci_drv 2011-10-30 13:47:25 +01:00
scx200_i2c.c i2c: Use <linux/io.h> instead of <asm/io.h> 2010-05-21 18:41:01 +02:00