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

..

ams

macintosh/ams: don't use flush_scheduled_work()

2010-12-24 15:59:07 +01:00

adb-iop.c

drivers/macintosh/adb-iop.c: flags should be unsigned long

2010-11-12 07:55:30 -08:00

adb.c

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:49:54 -07:00

adbhid.c

Fix common misspellings

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

ans-lcd.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

ans-lcd.h

[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need

2007-08-22 22:43:29 -05:00

apm_emu.c

[POWERPC] apm_emu: Use generic apm-emulation

2007-05-02 16:42:19 +10:00

Kconfig

leds: fix up dependencies

2010-12-02 14:51:15 -08:00

mac_hid.c

Input: mac mouse emulation - add locking

2010-11-11 22:22:19 -08:00

macio_asic.c

powerpc/macio: Ensure all dma routines get copied over

2010-11-29 15:48:21 +11:00

macio_sysfs.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

macio-adb.c

Fix common misspellings

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

Makefile

Move ams driver to macintosh

2010-10-28 20:31:50 +02:00

mediabay.c

powerpc/macio: Fix probing of macio devices by using the right of match table

2010-06-02 17:50:38 +10:00

nvram.c

drivers: fix up various ->llseek() implementations

2011-07-20 20:47:58 -04:00

rack-meter.c

powerpc/macintosh: Fix __devexit annotation in rack-meter.c

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

smu.c

driver-core: remove sysdev.h usage.

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

therm_adt746x.c

Fix common misspellings

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

therm_pm72.c

treewide: fix a few typos in comments

2011-05-10 10:16:21 +02:00

therm_pm72.h

powerpc: Fix G5 thermal shutdown

2010-03-09 11:55:27 +11:00

therm_windtunnel.c

Fix common misspellings

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

via-cuda.c

mac68k: start CUDA early

2010-02-27 18:31:13 +01:00

via-macii.c

m68k/irq: Remove obsolete IRQ_FLG_* users

2011-11-08 22:35:48 +01:00

via-maciisi.c

m68k/irq: Remove obsolete IRQ_FLG_* users

2011-11-08 22:35:48 +01:00

via-pmu68k.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

via-pmu-backlight.c

backlight: add backlight type

2011-03-22 17:43:59 -07:00

via-pmu-event.c

Input: via-pmu - add input device support

2006-06-26 01:49:55 -04:00

via-pmu-event.h

Input: via-pmu - add input device support

2006-06-26 01:49:55 -04:00

via-pmu-led.c

powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak

2010-09-02 14:07:33 +10:00

via-pmu.c

powerpc/pmac: Update via-pmu to new syscore_ops

2011-05-20 15:37:22 +10:00

windfarm_core.c

device_attributes: add sysfs_attr_init() for dynamic attributes

2010-04-07 08:38:03 -07:00

windfarm_cpufreq_clamp.c

of: add 'of_' prefix to machine_is_compatible()

2010-02-09 08:33:00 -07:00

windfarm_lm75_sensor.c

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

windfarm_max6690_sensor.c

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

windfarm_pid.c

[PATCH] windfarm license fix

2006-03-06 18:40:45 -08:00

windfarm_pid.h

[PATCH] powerpc: Thermal control for dual core G5s

2006-02-07 22:05:14 -08:00

windfarm_pm81.c

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

2010-05-21 11:17:05 -07:00

windfarm_pm91.c

powerpc/pmac/windfarm: Correct potential double free

2010-04-07 18:00:40 +10:00

windfarm_pm112.c

of: add 'of_' prefix to machine_is_compatible()

2010-02-09 08:33:00 -07:00

windfarm_pm121.c

replace nested max/min macros with {max,min}3 macro

2010-10-26 16:52:12 -07:00

windfarm_smu_controls.c

sysfs: windfarm: init sysfs attributes

2010-03-07 17:04:51 -08:00

windfarm_smu_sat.c

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

windfarm_smu_sensors.c

of: add 'of_' prefix to machine_is_compatible()

2010-02-09 08:33:00 -07:00

windfarm.h

[PATCH] powerpc: Thermal control for dual core G5s

2006-02-07 22:05:14 -08:00