summaryrefslogtreecommitdiff
path: root/kernel/pid.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-04 11:45:25 +0100
committerIngo Molnar <mingo@elte.hu>2010-03-04 11:45:31 +0100
commit0e064caf6402d1d67db4233d26beec88ca212919 (patch)
tree2bb6affb9cdeb23adff35dee7ca9fe1c14475f18 /kernel/pid.c
parent90a6501f94aedd7fb40f5556334843194fb598be (diff)
parentf409adf5b1db55ece7e80b67a944f9c0d3fe93e9 (diff)
parentc13f3d378f77ce3176628ade452b0e461242faf3 (diff)
downloadlinux-0e064caf6402d1d67db4233d26beec88ca212919.tar.gz
Merge branches 'core/futexes' and 'core/iommu' into core/urgent
Merge reason: Switch from topical split to the stabilization track Signed-off-by: Ingo Molnar <mingo@elte.hu>