aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 09:38:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 09:38:55 -0700
commitf2e4bd2b37bf072babc6a1f6c2a7ef53b7b046ad (patch)
tree65d0ab5002c5f748a3fbca803e99b2f271072021 /include/linux
parent133e887f90208d339088dd60cb1d08a72ba27288 (diff)
parent5f86515158ca86182c1dbecd546f1848121ba135 (diff)
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'
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions