summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
Commit message (Expand)AuthorAgeFilesLines
* powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()roel kluin2011-01-211-2/+2
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-132-3/+3
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-12-222-2/+3
| |\
| * | suspend: constify platform_suspend_opsLionel Debroux2010-11-161-1/+1
| * | backlight: constify backlight_opsLionel Debroux2010-11-161-2/+2
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2011-01-112-29/+8
|\ \ \
| * \ \ Merge remote branch 'gcl/next' into nextBenjamin Herrenschmidt2011-01-111-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | powerpc/powermac: Make auto-loading of therm_pm72 possibleMarc Zyngier2010-12-091-25/+5
| * | | powerpc/macio: Ensure all dma routines get copied overNishanth Aravamudan2010-11-291-4/+3
* | | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-072-3/+3
|\ \ \ \
| * | | | macintosh/ams: don't use flush_scheduled_work()Tejun Heo2010-12-241-1/+1
| * | | | workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_dela...Tejun Heo2010-12-151-2/+2
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-071-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Input: mac mouse emulation - add lockingDmitry Torokhov2010-11-111-0/+8
| | |/ | |/|
* | | leds: fix up dependenciesJohannes Berg2010-12-021-0/+1
| |/ |/|
* | drivers/macintosh/adb-iop.c: flags should be unsigned longGeert Uytterhoeven2010-11-121-2/+2
|/
* Move ams driver to macintoshJean Delvare2010-10-288-0/+991
* replace nested max/min macros with {max,min}3 macroHagen Paul Pfeifer2010-10-261-1/+1
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-3/+3
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-3/+3
* | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-222-0/+2
|\ \
| * | llseek: automatically add .llseek fopArnd Bergmann2010-10-152-0/+2
* | | Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-223-13/+14
|\ \ \
| * | | mac: autoconvert trivial BKL users to private mutexArnd Bergmann2010-09-153-13/+14
| |/ /
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-10-211-1/+3
|\ \ \
| * | | powerpc/via-pmu-led.c: Add of_node_put to avoid memory leakJulia Lawall2010-09-021-1/+3
| |/ /
* | | drivers/macintosh/adb: Do not claim that the semaphore is a mutexThomas Gleixner2010-10-121-1/+1
|/ /
* | via-pmu: Add compat_pmu_ioctlAndreas Schwab2010-08-241-0/+42
* | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-08-121-2/+2
|\ \
| * | i2c: Add support for custom probe functionJean Delvare2010-08-111-2/+2
| |/
* | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-125-13/+13
|\ \ | |/ |/|
| * of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-065-13/+13
* | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-08-061-4/+5
|\ \ | |/ |/|
| * powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interruptsIan Campbell2010-07-291-4/+5
* | of: Modify of_device_get_modalias to be passed struct deviceGrant Likely2010-07-051-4/+1
|/
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2010-06-033-9/+13
|\
| * powerpc/macio: Fix probing of macio devices by using the right of match tableBenjamin Herrenschmidt2010-06-023-6/+9
| * powerpc/macio: Don't dereference pointer before null checkAndreas Schwab2010-06-021-3/+4
* | i2c: Remove all i2c_set_clientdata(client, NULL) in driversWolfram Sang2010-06-034-8/+1
|/
* Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-242-4/+15
|\
| * drivers: Push down BKL into various driversArnd Bergmann2010-05-172-4/+15
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-225-12/+12
|\ \
| * \ Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-05-215-11/+11
| |\ \
| | * \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2010-05-071-0/+1
| | |\ \ | | | |/
| | * | powerpc/pmac: Fix dangling pointersWolfram Sang2010-04-071-0/+2
| | * | powerpc/pmac: Add missing unlocks in error pathJulia Lawall2010-04-072-1/+4
| | * | powerpc/pmac/windfarm: Correct potential double freeJulia Lawall2010-04-071-6/+3
| | * | powerpc/pmac/windfarm: Don't test pointers before kfree()d binderman2010-04-071-4/+2
| * | | Merge branch 'master' into for-nextJiri Kosina2010-04-238-5/+10
| |\ \ \ | | | |/ | | |/|
| * | | Fix typos in commentsThomas Weber2010-03-161-1/+1
OpenPOWER on IntegriCloud