Merge commit 'v2.6.31-rc8' into core/locking
authorIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 15:54:18 +0000 (17:54 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 31 Aug 2009 16:05:25 +0000 (18:05 +0200)
commitbbe69aa57a7374b51242b95a54eefcf0d0393b7e
treec45e48d11cc9cb81a57c8c27f7243863b117cec8
parenta417887637e862b434b293404f2a31ad1f282a58
parent326ba5010a5429a5a528b268b36a5900d4ab0eba
Merge commit 'v2.6.31-rc8' into core/locking

Merge reason: we were on -rc4, move to -rc8 before applying
              a new batch of locking infrastructure changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/lockdep_proc.c