Merge branch 'linus' into tracing/urgent
commit5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231
authorIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 20:37:07 +0000 (18 21:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 20:37:07 +0000 (18 21:37 +0100)
tree29dd80a7b33426d0890aa07b5864224557c62af7
parent0bb943c7a2136716757a263f604d26309fd98042
parent7f0f598a0069d1ab072375965a4b69137233169c
Merge branch 'linus' into tracing/urgent