summaryrefslogtreecommitdiffstats
path: root/Documentation/hwmon
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-04 00:41:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-04 00:41:10 +0200
commitcd1d2d279a4b149301ef0316d12ba4b29424a802 (patch)
tree206ac2ae7c210e55b1e1ff0872ffb70ecdcecc7c /Documentation/hwmon
parentrxrpc: remove smp_processor_id() from debug macro (diff)
parent[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works (diff)
downloadlinux-cd1d2d279a4b149301ef0316d12ba4b29424a802.tar.xz
linux-cd1d2d279a4b149301ef0316d12ba4b29424a802.zip
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] Fix MPC5200 (not B!) device tree so FEC ethernet works [POWERPC] mpc5200: Amalgamated DTS fixes and updates [POWERPC] Fix rtas_flash procfs interface [POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync [POWERPC] Fix iSeries hard irq enabling regression [POWERPC] Fix CPM2 SCC1 clock initialization. [POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB [POWERPC] fsldma: Use compatiable binding as spec [POWERPC] sata_fsl: reduce compatibility to fsl,pq-sata [POWERPC] 83xx: enable usb in 837x rdb and 83xx defconfigs [POWERPC] 83xx: Fix wrong USB phy type in mpc837xrdb dts
Diffstat (limited to 'Documentation/hwmon')
0 files changed, 0 insertions, 0 deletions