projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd6d29c 66f41d4)
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 patch | diff1 | diff2 | blob | history
kernel/lockdep.c patch | diff1 | diff2 | blob | history
sound/drivers/pcsp/pcsp_lib.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/hd.c
Simple merge
diff --cc kernel/lockdep.c
Simple merge
diff --cc sound/drivers/pcsp/pcsp_lib.c
Simple merge