linux/drivers/macintosh
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -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
ans-lcd.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
ans-lcd.h
apm_emu.c
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-adb.c powerpc/pmac: Add missing unlocks in error path 2010-04-07 18:00:44 +10: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
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: Push down BKL into various drivers 2010-05-17 05:27:41 +02:00
rack-meter.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
smu.c mac: autoconvert trivial BKL users to private mutex 2010-09-15 21:00:47 +02:00
therm_adt746x.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
therm_pm72.c powerpc/powermac: Make auto-loading of therm_pm72 possible 2010-12-09 15:36:30 +11:00
therm_pm72.h powerpc: Fix G5 thermal shutdown 2010-03-09 11:55:27 +11:00
therm_windtunnel.c Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 2010-08-12 10:06:29 -07: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-pmu-backlight.c backlight: constify backlight_ops 2010-11-16 14:14:02 +01:00
via-pmu-event.c
via-pmu-event.h
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 suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +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
windfarm.h
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
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 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