]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 16:38:55 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 16:38:55 +0000 (09:38 -0700)
commit8911d17607ac067b6fe6d733f5a2a6f54a05e936
tree65d0ab5002c5f748a3fbca803e99b2f271072021
parentdfdebb2828c3e8ddcdbbbca94e55bf8397a3634b
parent59f0688e4c7055b0ab4f2bde698a86cdb6315a21
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcupdate: fix bug of rcu_barrier*()
  profiling: fix !procfs build

Fixed trivial conflicts in 'include/linux/profile.h'