linux-stable/drivers/macintosh
Linus Torvalds 723e9db7a4 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c
2009-09-15 09:51:09 -07:00
..
adb-iop.c
adb.c
adbhid.c
ans-lcd.c
ans-lcd.h
apm_emu.c
Kconfig powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK 2009-04-22 14:56:35 +10:00
mac_hid.c
macio-adb.c
macio_asic.c powerpc/macio: Don't the address of an array element before boundchecking 2009-08-20 10:29:26 +10:00
macio_sysfs.c
Makefile
mediabay.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 2009-04-24 08:16:05 -07:00
nvram.c
rack-meter.c
smu.c
therm_adt746x.c Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 2009-06-16 11:29:17 -07:00
therm_pm72.c therm_pm72: Convert to a new-style i2c driver 2009-06-15 18:01:50 +02:00
therm_pm72.h
therm_windtunnel.c powerpc/powermac: Thermal control turns system off too eagerly 2009-09-02 15:46:00 +10:00
via-cuda.c
via-macii.c
via-maciisi.c m68k: count can reach 51, not 50 2009-08-26 23:14:49 +02:00
via-pmu-backlight.c
via-pmu-event.c
via-pmu-event.h
via-pmu-led.c
via-pmu.c
via-pmu68k.c
windfarm.h
windfarm_core.c
windfarm_cpufreq_clamp.c
windfarm_lm75_sensor.c windfarm: Convert to new-style i2c drivers 2009-06-15 18:01:51 +02:00
windfarm_max6690_sensor.c windfarm: Convert to new-style i2c drivers 2009-06-15 18:01:51 +02:00
windfarm_pid.c
windfarm_pid.h
windfarm_pm81.c
windfarm_pm91.c
windfarm_pm112.c
windfarm_pm121.c
windfarm_smu_controls.c
windfarm_smu_sat.c windfarm: Convert to new-style i2c drivers 2009-06-15 18:01:51 +02:00
windfarm_smu_sensors.c