]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf4f42b 476099a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2010 16:37:12 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2010 16:37:12 +0000 (09:37 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: docs: add an entry for imx2_wdt


Trivial merge
Clone of davem's net-next-2.6 tree