diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:46:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:46:37 -0700 |
commit | 39059cceeda478cd040d521b9541d1113035c908 (patch) | |
tree | 56adf04d6766a4346160aacd709468e5b2f1b879 /drivers/macintosh/windfarm_lm75_sensor.c | |
parent | Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6 (diff) | |
parent | powerpc/macio: Fix probing of macio devices by using the right of match table (diff) | |
download | linux-dev-39059cceeda478cd040d521b9541d1113035c908.tar.xz linux-dev-39059cceeda478cd040d521b9541d1113035c908.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/macio: Fix probing of macio devices by using the right of match table
agp/uninorth: Fix oops caused by flushing too much
powerpc/pasemi: Update MAINTAINERS file
powerpc/cell: Fix integer constant warning
powerpc/kprobes: Remove resume_execution() in kprobes
powerpc/macio: Don't dereference pointer before null check
Diffstat (limited to 'drivers/macintosh/windfarm_lm75_sensor.c')
0 files changed, 0 insertions, 0 deletions