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
parentMerge branch 'core/iommu' into core/urgent (diff)
parentfutex: catch certain assymetric (get|put)_futex_key calls (diff)
parentlocking, percpu counters: introduce separate lock classes (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff)
downloadlinux-fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff.tar.xz
linux-fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff.zip
Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent