summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 09:32:11 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-06 09:32:11 +0100
commitfdbc0450df12cc9cb397f3497db4b0cad7c1a8ff (patch)
tree3d266bd156f140f06b22f27784a7487bba6d6da5
parent46483d10e5123d78cf9abf37577aa8e75f18b8a4 (diff)
parent90621c40cc4ab7b0a414311ce37e7cc7173403b6 (diff)
parentea319518ba3de282c13ae1cf4bf2215c5e03e67e (diff)
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent