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

..

bestcomm

powerpc: various straight conversions from module.h --> export.h

2011-10-31 19:30:44 -04:00

qe_lib

Merge branch 'driver-core-next' into Linux 3.2

2012-01-06 11:42:52 -08:00

xics

powerpc/irq: Remove IRQF_DISABLED

2011-11-08 14:51:46 +11:00

6xx-suspend.S

[POWERPC] Add 6xx-style HID0_SLEEP support.

2008-05-16 23:22:28 +10:00

axonram.c

block: remove support for bio remapping from ->make_request

2011-09-12 12:12:01 +02:00

cpm1.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

cpm2_pic.c

powerpc/irq: Stop exporting irq_map

2011-05-04 15:02:15 +10:00

cpm2_pic.h

powerpc/cpm2: Checkpatch cleanup

2010-03-04 10:43:58 -06:00

cpm2.c

powerpc/fsl-cpm: Configure clock correctly for SCC

2010-04-19 23:13:03 -05:00

cpm_common.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

dart_iommu.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

dart.h

[POWERPC] Use 4kB iommu pages even on 64kB-page systems

2006-11-01 14:52:48 +11:00

dcr-low.S

powerpc/4xx: Extended DCR support v2

2008-12-21 14:21:15 +11:00

dcr.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

ehv_pic.c

arch/powerpc/sysdev/ehv_pic.c: add missing kfree

2011-11-24 02:01:24 -06:00

fsl_85xx_cache_ctlr.h

powerpc/85xx: add cache-sram support

2010-10-14 00:54:38 -05:00

fsl_85xx_cache_sram.c

powerpc: Remove ioremap_flags

2011-05-19 14:30:43 +10:00

fsl_85xx_l2ctlr.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2011-03-18 06:31:43 -07:00

fsl_gtm.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

fsl_lbc.c

powerpc/fsl-lbc: Fix for fsl_upm

2011-11-24 02:00:42 -06:00

fsl_msi.c

powerpc/fsl_msi: add support for "msi-address-64" property

2011-10-14 02:54:29 -05:00

fsl_msi.h

powerpc/fsl_msi: add support for "msi-address-64" property

2011-10-14 02:54:29 -05:00

fsl_pci.c

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:12:10 -07:00

fsl_pci.h

powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x

2011-03-15 09:29:56 -05:00

fsl_pmc.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

fsl_rio.c

fsl-rio: fix compile error

2011-11-14 12:43:17 -05:00

fsl_soc.c

powerpc: various straight conversions from module.h --> export.h

2011-10-31 19:30:44 -04:00

fsl_soc.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next

2011-08-29 09:14:30 +00:00

grackle.c

powerpc: rename ppc_pci_*_flags to pci_*_flags

2011-07-12 09:28:04 -05:00

i8259.c

powerpc: Remove i8259 irq_host_ops->unmap

2011-05-19 15:31:41 +10:00

indirect_pci.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ipic.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

ipic.h

[POWERPC] ipic: ack only for edge interrupts

2007-12-12 01:53:07 -06:00

Kconfig

powerpc/4xx: Adding PCIe MSI support

2011-05-26 15:00:37 +10:00

Makefile

gpio: move mpc8xxx/512x gpio driver to drivers/gpio

2011-09-23 00:14:15 +02:00

micropatch.c

powerpc/cpm1: Mark micropatch code/data static and __init

2010-07-11 11:04:06 -05:00

mmio_nvram.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

mpc5xxx_clocks.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

mpc8xx_pic.c

powerpc: remove non-required uses of include <linux/module.h>

2011-10-31 19:30:44 -04:00

mpc8xx_pic.h

[POWERPC] 8xx: mpc885ads pcmcia support

2007-07-10 00:33:51 -05:00

mpic_msi.c

powerpc: Fix MSI support on U4 bridge PCIe slot

2009-12-18 14:55:43 +11:00

mpic_pasemi_msi.c

powerpc: Convert to new irq_* function names

2011-03-29 14:48:12 +02:00

mpic_u3msi.c

powerpc: Convert to new irq_* function names

2011-03-29 14:48:12 +02:00

mpic.c

powerpc/irq: Remove IRQF_DISABLED

2011-11-08 14:51:46 +11:00

mpic.h

powerpc: mpic irq_data conversion.

2011-03-10 11:03:56 +11:00

msi_bitmap.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

mv64x60_dev.c

powerpc/mv64x60: Suspected typo in assignment

2011-03-02 16:50:05 +11:00

mv64x60_pci.c

powerpc: Fix up implicit stat.h users

2011-10-31 19:30:39 -04:00

mv64x60_pic.c

powerpc/irq: Stop exporting irq_map

2011-05-04 15:02:15 +10:00

mv64x60_udbg.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

mv64x60.h

[POWERPC] Add Marvell mv64x60 udbg putc/getc functions

2007-09-22 14:49:21 +10:00

of_rtc.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

pmi.c

powerpc: Fix up modules that should be including module.h

2011-10-31 19:30:38 -04:00

ppc4xx_cpm.c

cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

2011-12-21 14:29:42 -08:00

ppc4xx_gpio.c

of/gpio: add default of_xlate function if device has a node pointer

2010-07-05 16:14:30 -06:00

ppc4xx_msi.c

powerpc: include export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:30:38 -04:00

ppc4xx_pci.c

powerpc/4xx/pci: Add __init annotations for *init_port_hw() functions.

2011-09-20 09:19:56 +10:00

ppc4xx_pci.h

powerpc/4xx: enable and fix pcie gen1/gen2 on the 460sx

2011-08-11 13:51:18 -04:00

ppc4xx_soc.c

powerpc/irq: Remove IRQF_DISABLED

2011-11-08 14:51:46 +11:00

rtc_cmos_setup.c

powerpc: Fix up modules that should be including module.h

2011-10-31 19:30:38 -04:00

scom.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

simple_gpio.c

powerpc: remove non-required uses of include <linux/module.h>

2011-10-31 19:30:44 -04:00

simple_gpio.h

powerpc: Implement GPIO driver for simple memory-mapped banks

2008-12-30 11:13:45 -06:00

tsi108_dev.c

powerpc: various straight conversions from module.h --> export.h

2011-10-31 19:30:44 -04:00

tsi108_pci.c

powerpc: Convert to new irq_* function names

2011-03-29 14:48:12 +02:00

uic.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

xilinx_intc.c

powerpc/irq: Stop exporting irq_map

2011-05-04 15:02:15 +10:00

xilinx_pci.c

powerpc/virtex: Add support for Xilinx PCI host bridge

2009-06-06 10:14:22 -06:00