Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 15:18:17 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 15:18:17 +0000 (08:18 -0700)
commit3bd1911b134ce4a669ea6cf531a36440753b0aaa
tree6e82f12a43c01cb344615eb8f4093d6fb83f78b8
parent1910e021f2249402c3f103a5a1a15ebda211d1da
parent7275fc8c36dbad3a871f82b1f9f1f524688176ea
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] unlocked_ioctl changes
  [WATCHDOG] wdt285: fix sparse warnings
  [WATCHDOG] ibmasr: remove unnecessary spin_unlock()