commit | 01974ea61fc22f086d2987b4b717cbda055f0d03 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 25 19:03:58 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 25 19:03:58 2010 -0800 |
tree | bf5dacb0640bece071cc2b68378bc75a40cfa94a | |
parent | 7c1c05afddf6bb0a4804cb506f3885248a749aa2 [diff] | |
parent | ef39a1bf3c4fbdea085c618be424cc88b803f248 [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] sbc_fitpc2_wdt: fix I/O space access technique. [WATCHDOG] ixp2000: Fix build failure caused by missing include