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/arch/powerpc/platforms/powermac
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
..
backlight.c powerpc: add export.h to files making use of EXPORT_SYMBOL 2011-10-31 19:30:37 -04:00
bootx_init.c powerpc: Remove trailing space in messages 2010-02-09 13:56:23 +11:00
cache.S
cpufreq_32.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
cpufreq_64.c powerpc/cpumask: Use cpu_online_mask 2010-05-06 17:16:12 +10:00
feature.c powerpc: add export.h to files making use of EXPORT_SYMBOL 2011-10-31 19:30:37 -04:00
Kconfig powerpc: Add kconfig for muxed smp ipi support 2011-05-19 15:31:05 +10:00
low_i2c.c powerpc: various straight conversions from module.h --> export.h 2011-10-31 19:30:44 -04:00
Makefile Fix common misspellings 2011-03-31 11:26:23 -03:00
nvram.c powerpc: various straight conversions from module.h --> export.h 2011-10-31 19:30:44 -04:00
pci.c powerpc: Fix device-tree matching for Apple U4 bridge 2011-09-29 19:22:40 -07:00
pfunc_base.c powerpc: Convert feature_lock to raw_spinlock 2010-02-19 14:52:32 +11:00
pfunc_core.c powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
pic.c powerpc/irq: Remove IRQF_DISABLED 2011-11-08 14:51:46 +11:00
pmac.h powerpc/psurge: Create a irq_host for secondary cpus 2011-05-19 15:31:51 +10:00
setup.c powerpc: add export.h to files making use of EXPORT_SYMBOL 2011-10-31 19:30:37 -04:00
sleep.S powerpc/mm: Introduce MMU features 2008-12-21 14:21:16 +11:00
smp.c powerpc/irq: Remove IRQF_DISABLED 2011-11-08 14:51:46 +11:00
time.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
udbg_adb.c [POWERPC] Fix section mismatches in udbg_adb.c 2007-08-17 11:02:06 +10:00
udbg_scc.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00