summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 12:16:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-18 12:16:38 +0200
commit2e9521fd656f05a716b5294a7dbebd37ced05e43 (patch)
treeaea92c8a1a21774a569a047ba3bb60e8c04c740d /kernel/watchdog.c
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parent[media] V4L: soc-camera: regression fix: calculate .sizeimage in soc_camera.c (diff)
downloadlinux-2e9521fd656f05a716b5294a7dbebd37ced05e43.tar.xz
linux-2e9521fd656f05a716b5294a7dbebd37ced05e43.zip
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] V4L: soc-camera: regression fix: calculate .sizeimage in soc_camera.c [media] v4l2-subdev: fix broken subdev control enumeration [media] Fix cx88 remote control input [media] v4l: Release module if subdev registration fails
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions