Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4d97cc5342
linux/drivers/macintosh
History
Linus Torvalds 229aebb873 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: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
adb-iop.c [POWERPC] Remove old includes from arch/ppc 2007-08-22 22:39:35 -05: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 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 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 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 powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10: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 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 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 powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10: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 of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06: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-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 powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak 2010-09-02 14:07:33 +10:00
via-pmu.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -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 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 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 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