summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-24 10:24:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-24 10:24:52 -0800
commitc20137fc5329eaf24093fc48c52608dc66be8e5c (patch)
treeb6921a20df62076e3cb67d140e46f7056f139a5d /arch/x86/include/asm/timex.h
parent1806f826554efd206cebacc7f9f213c8e6493a5d (diff)
parent231ffc9c07021afcfb1afa229aa4935730e5163b (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well. V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204 V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking. V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support) V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
Diffstat (limited to 'arch/x86/include/asm/timex.h')
0 files changed, 0 insertions, 0 deletions