android_kernel_xiaomi_sm8350/arch/powerpc/sysdev
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
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
cpm2_pic.h
cpm2.c
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
dcr-low.S
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
fsl_85xx_cache_sram.c powerpc: Remove ioremap_flags 2011-05-19 14:30:43 +10:00
fsl_85xx_l2ctlr.c
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
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
ipic.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
ipic.h
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
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
mpic_msi.c
mpic_pasemi_msi.c
mpic_u3msi.c
mpic.c powerpc/irq: Remove IRQF_DISABLED 2011-11-08 14:51:46 +11:00
mpic.h
msi_bitmap.c
mv64x60_dev.c
mv64x60_pci.c powerpc: Fix up implicit stat.h users 2011-10-31 19:30:39 -04:00
mv64x60_pic.c
mv64x60_udbg.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
mv64x60.h
of_rtc.c
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
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
tsi108_dev.c powerpc: various straight conversions from module.h --> export.h 2011-10-31 19:30:44 -04:00
tsi108_pci.c
uic.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
xilinx_intc.c
xilinx_pci.c