summaryrefslogtreecommitdiff
path: root/include/linux/timerqueue.h
diff options
context:
space:
mode:
authorRoland Dreier2014-02-14 09:49:12 -0800
committerRoland Dreier2014-02-14 09:49:12 -0800
commitc9459388d8b7da050de173eb85359b17ee575bd3 (patch)
tree86421cf59cf53471993f762981a2065a7a13776d /include/linux/timerqueue.h
parentb4a26a27287a7f81933ba016aeed6c69dd155323 (diff)
parent0f0132001fd239bb67c1f68436b95cc79de89736 (diff)
parentfd8b48b22a2b7cdf21f15b01cae379e6159a7eea (diff)
parentab576627c8f97c08297d81537be17df161171923 (diff)
parentad4885d279b63c65347220236d07669a2f59634b (diff)
parent0861565f501ce3fcea9394d4b98c02b1f6de6b9e (diff)
parentd07875bd0d1517185534b5f9eef469426ba42cb9 (diff)
parent09de3f1313a30d8a22e488c9a5b96a9560cae96d (diff)
parent2f75e12c4457a9b3d042c0a0d748fa198dc2ffaf (diff)
parentf809309a251a13bd97cc189c3fa428782aab9716 (diff)
Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next