tree 65d0ab5002c5f748a3fbca803e99b2f271072021
parent 133e887f90208d339088dd60cb1d08a72ba27288
parent 5f86515158ca86182c1dbecd546f1848121ba135
author Linus Torvalds <torvalds@linux-foundation.org> 1224779935 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224779935 -0700

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'