aboutsummaryrefslogtreecommitdiff
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 12:04:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 12:04:04 -0700
commit7c1632ba76d94b4847fde79f67faa91ef8571fe9 (patch)
tree012076beb659ee4609a8101c1fa9e90c759a38f0 /include/linux/socket.h
parenta888f96a154b70804c5b29ee02e4d3bda6d55e56 (diff)
parent9bcbdd9c58617f1301dd4f17c738bb9bc73aca70 (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: x86, timers: Check for pending timers after (device) interrupts NOHZ: update idle state also when NOHZ is inactive
Diffstat (limited to 'include/linux/socket.h')
0 files changed, 0 insertions, 0 deletions