summaryrefslogtreecommitdiff
path: root/scripts/kconfig/merge_config.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 05:07:13 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 05:07:13 +0400
commit3a0d1849432461eec1321f8918c6c13497d390c9 (patch)
tree694bafcc856b38ba99eb2172c8c5b061cfa0d529 /scripts/kconfig/merge_config.sh
parent623ff7739e7c00fa3d55dbfd42a492a68298fd7a (diff)
parentec0c4274e33c0373e476b73e01995c53128f1257 (diff)
downloadlinux-3a0d1849432461eec1321f8918c6c13497d390c9.tar.xz
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking updates from Thomas Gleixner. * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Mark get_robust_list as deprecated futex: Do not leak robust list to unprivileged process
Diffstat (limited to 'scripts/kconfig/merge_config.sh')
0 files changed, 0 insertions, 0 deletions