]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge commit 'v2.6.34-rc6' into core/locking
authorFrederic Weisbecker <fweisbec@gmail.com>
Fri, 30 Apr 2010 17:11:13 +0000 (19:11 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Fri, 30 Apr 2010 17:12:47 +0000 (19:12 +0200)
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.

1  2 
drivers/block/hd.c
kernel/lockdep.c
sound/drivers/pcsp/pcsp_lib.c

Simple merge
Simple merge
Simple merge