Merge commit 'v2.6.34-rc6' into core/locking
authorIngo Molnar <mingo@elte.hu>
Mon, 3 May 2010 07:17:01 +0000 (09:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 May 2010 07:17:01 +0000 (09:17 +0200)
commit53ba4f2fa73225113a488584df0d85d3cba52943
treed85b984d9818abc3ccc0237eb53b710d9e96c39e
parentbd6d29c25bb1a24a4c160ec5de43e0004e01f72b
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8
Merge commit 'v2.6.34-rc6' into core/locking
drivers/block/hd.c
kernel/lockdep.c
sound/drivers/pcsp/pcsp_lib.c