aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/device-mapper.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-17 13:28:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-17 13:28:33 -0400
commit6cac95296034bed7b2716d5f4e417a26a618da94 (patch)
tree1a405f211c64f20359e42b3783d0487647da9822 /include/linux/device-mapper.h
parent2da9f365fc401b79627bc7be56d8a2b4ee9b390b (diff)
parent6e7a333eaa522ef73be01caec7a01521490aaf00 (diff)
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rtc: Limit RTC PIE frequency rtc: Fix hrtimer deadlock rtc: Handle errors correctly in rtc_irq_set_state() Fixup trivial conflicts in drivers/rtc/interface.c due to slightly trivially versions of the same patch coming in two different ways.
Diffstat (limited to 'include/linux/device-mapper.h')
0 files changed, 0 insertions, 0 deletions