linux/drivers/macintosh
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
adb-iop.c [POWERPC] Remove old includes from arch/ppc 2007-08-22 22:39:35 -05:00
adb.c mac68k: start CUDA early 2010-02-27 18:31:13 +01: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 Input: Mac button emulation - allow compiling as a module 2010-01-30 01:48:03 -08:00
mac_hid.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
macio_asic.c of: change of_match_device to work with struct device 2010-05-22 00:10:41 -06:00
macio_sysfs.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
macio-adb.c powerpc/pmac: Add missing unlocks in error path 2010-04-07 18:00:44 +10:00
Makefile [POWERPC] windfarm: Add PowerMac 12,1 support 2008-04-29 15:57:35 +10:00
mediabay.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
nvram.c macintosh: Remove BKL from nvram driver 2009-11-24 14:31:27 +11:00
rack-meter.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
smu.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
therm_adt746x.c powerpc/pmac: Fix dangling pointers 2010-04-07 18:00:46 +10:00
therm_pm72.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
therm_pm72.h powerpc: Fix G5 thermal shutdown 2010-03-09 11:55:27 +11:00
therm_windtunnel.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
via-cuda.c mac68k: start CUDA early 2010-02-27 18:31:13 +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 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: Allow properties to be passed at registration 2010-03-16 19:47:54 +00: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 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 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 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 of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00
windfarm_smu_controls.c sysfs: windfarm: init sysfs attributes 2010-03-07 17:04:51 -08: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