Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:03:58 +0000 (19:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:03:58 +0000 (19:03 -0800)
commit01974ea61fc22f086d2987b4b717cbda055f0d03
treebf5dacb0640bece071cc2b68378bc75a40cfa94a
parent7c1c05afddf6bb0a4804cb506f3885248a749aa2
parentef39a1bf3c4fbdea085c618be424cc88b803f248
Merge git://git./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