summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 23:58:39 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-23 23:58:39 +0100
commit827fa4c762fa81fbfcd262505588feeeae7a3b66 (patch)
tree1dbbfcfb0e3a6e6a453f630bfa008fba6bf78daf /drivers/watchdog
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentBtrfs: call d_instantiate after all ops are setup (diff)
downloadlinux-827fa4c762fa81fbfcd262505588feeeae7a3b66.tar.xz
linux-827fa4c762fa81fbfcd262505588feeeae7a3b66.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: call d_instantiate after all ops are setup Btrfs: fix worker lock misuse in find_worker
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions