summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/adm1025.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 17:02:58 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 17:02:58 +0200
commit064e297c324fff9b62226aae5dc468ebb272433c (patch)
tree49d031d180a30d6e94e4cfdcc46ec966399d8856 /drivers/hwmon/adm1025.c
parentMerge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre... (diff)
parentBlackfin: SMP: fix continuation lines (diff)
downloadlinux-064e297c324fff9b62226aae5dc468ebb272433c.tar.xz
linux-064e297c324fff9b62226aae5dc468ebb272433c.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (30 commits) Blackfin: SMP: fix continuation lines Blackfin: acvilon: fix timeout usage for I2C Blackfin: fix typo in BF537 IRQ comment Blackfin: unify duplicate MEM_MT48LC32M8A2_75 kconfig options Blackfin: set ARCH_KMALLOC_MINALIGN Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic Blackfin: another year of changes (update copyright in boot log) Blackfin: optimize strncpy a bit Blackfin: isram: clean up ITEST_COMMAND macro and improve the selftests Blackfin: move string functions to normal lib/ assembly Blackfin: SIC: cut down on IAR MMR reads a bit Blackfin: bf537-minotaur: fix build errors due to header changes Blackfin: kgdb: pass up the CC register instead of a 0 stub Blackfin: handle HW errors in the new "FAULT" printing code Blackfin: show the whole accumulator in the pseudo DBG insn Blackfin: support all possible registers in the pseudo instructions Blackfin: add support for the DBG (debug output) pseudo insn Blackfin: change the BUG opcode to an unused 16-bit opcode Blackfin: allow NMI watchdog to be used w/RETN as a scratch reg Blackfin: add support for the DBGA (debug assert) pseudo insn ...
Diffstat (limited to 'drivers/hwmon/adm1025.c')
0 files changed, 0 insertions, 0 deletions