aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/therm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-30 12:04:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-30 12:04:29 -0700
commit71d00feca2598c68186ca5b83247746d6a7fed7e (patch)
treefe129bfc6a69ea00a43ceffdd04ad91898a0411e /include/asm-arm/therm.h
parent8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8 (diff)
parent19abe86d60eeb34c5deeb3ab2d14229fa9f59157 (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: ixgb: fix TX hangs under heavy load e1000e: Fix typo ! & ixgbe: minor sparse fixes e1000: sparse warnings fixes ixgb: fix sparse warnings e1000e: fix sparse warnings mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2 Blackfin EMAC driver: Fix Ethernet communication bug (dupliated and lost packets) DM9601: Support for ADMtek ADM8515 NIC
Diffstat (limited to 'include/asm-arm/therm.h')
0 files changed, 0 insertions, 0 deletions