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)
commitf2e4bd2b37bf072babc6a1f6c2a7ef53b7b046ad
tree65d0ab5002c5f748a3fbca803e99b2f271072021
parent133e887f90208d339088dd60cb1d08a72ba27288
parent5f86515158ca86182c1dbecd546f1848121ba135
Merge branch 'core-fixes-for-linus' of git://git./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'