Benjamin Herrenschmidt 874f2f997d Merge commit 'origin/master' into next ...

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h

2010-02-26 14:41:00 +11:00

..

adb-iop.c

[POWERPC] Remove old includes from arch/ppc

2007-08-22 22:39:35 -05:00

adb.c

of: add 'of_' prefix to machine_is_compatible()

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

adbhid.c

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

2008-07-21 00:55:14 -04:00

ans-lcd.c

macintosh: Remove BKL from ans-lcd

2009-10-14 17:36:50 +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

powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK

2009-04-22 14:56:35 +10:00

mac_hid.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

macio_asic.c

powerpc/macio: Add dma_parms support to macio

2009-12-08 16:02:52 +11:00

macio_sysfs.c

[POWERPC] Create modalias file in sysfs for of_platform bus

2008-05-14 22:31:28 +10:00

macio-adb.c

[POWERPC] Remove find_compatible_devices

2007-04-24 22:08:57 +10:00

Makefile

[POWERPC] windfarm: Add PowerMac 12,1 support

2008-04-29 15:57:35 +10:00

mediabay.c

powerpc/macio: Rework hotplug media bay support

2009-12-09 17:09:14 +11:00

nvram.c

macintosh: Remove BKL from nvram driver

2009-11-24 14:31:27 +11:00

rack-meter.c

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

smu.c

powerpc/macintosh: Make Open Firmware device id constant

2010-01-15 13:26:04 +11:00

therm_adt746x.c

powerpc: Remove trailing space in messages

2010-02-09 13:56:23 +11:00

therm_pm72.c

of: add 'of_' prefix to machine_is_compatible()

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

therm_pm72.h

…

therm_windtunnel.c

of: add 'of_' prefix to machine_is_compatible()

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

via-cuda.c

m68k: machw.h cleanup

2008-12-28 20:00:03 +01:00

via-macii.c

m68k: machw.h cleanup

2008-12-28 20:00:03 +01:00

via-maciisi.c

m68k: count can reach 51, not 50

2009-08-26 23:14:49 +02:00

via-pmu68k.c

m68k: machw.h cleanup

2008-12-28 20:00:03 +01:00

via-pmu-backlight.c

of: add 'of_' prefix to machine_is_compatible()

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

via-pmu-event.c

…

via-pmu-event.h

…

via-pmu-led.c

leds: Fix LED names

2009-09-07 14:37:27 +01:00

via-pmu.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_core.c

of: add 'of_' prefix to machine_is_compatible()

2010-02-09 08:33:00 -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

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_max6690_sensor.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_pid.c

…

windfarm_pid.h

…

windfarm_pm81.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_pm91.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_pm112.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_pm121.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm_smu_controls.c

powerpc/windfarm: Add detection for second cpu pump

2009-12-08 16:01:10 +11:00

windfarm_smu_sat.c

macintosh: Don't assume i2c device probing always succeeds

2009-10-04 22:53:46 +02:00

windfarm_smu_sensors.c

of: add 'of_' prefix to machine_is_compatible()

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

windfarm.h

…