diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 20:35:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 20:35:48 -0700 |
| commit | 7c12c92fba4bd985ed6d909e5537468b268dcaa4 (patch) | |
| tree | 569639a44c52335eefa1029f922a5eca8c40362e /drivers/acpi/thermal.c | |
| parent | 5a17558f06993fdc509362f659582b52b0f921e3 (diff) | |
| parent | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
[POWERPC] Update some defconfigs
Diffstat (limited to 'drivers/acpi/thermal.c')
0 files changed, 0 insertions, 0 deletions