]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2013 03:27:23 +0000 (19:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2013 03:27:23 +0000 (19:27 -0800)
commitc68fea3464cbe4f3e1382f9f74a7c04cdbfb92ad
tree841ccba71799209e6fceaceb30a7b3aa1437ce9a
parent3b5d8510b94a95e493e8c4951ffc3d1cf6a6792d
parentbc681593b588786e6326b3e5f78ccc1683e2269c
Merge tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 build breakage fix from Tony Luck.

* tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  sched: move RR_TIMESLICE from sysctl.h to rt.h