aboutsummaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-02 14:15:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-02 14:15:46 -0700
commit4905f92ed752d49ebe9cce4fe78a4bc39e710523 (patch)
tree533cdb174d61a92033083b027e0b34981fc42130 /drivers/w1
parent0ce166b7b46122bf91a4766e20c85a6485448765 (diff)
parent5973bee46fe66db94fab198979dec87f263fc2a8 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] Fix COH 901 327 watchdog enablement
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions