a1a6a4b77db parent 3b07e9ca26866697616097044f25fbe53dbab693 parent c5f66e99b7cb091e3d51ae8e8156892e8feb7fa3 author Tejun Heo 1345577472 -0700 committer Tejun Heo 1345577472 -0700 Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-3.7 ¾:i,œux