projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8725c8 53d5864)
Merge remote-tracking branch 'dh/afs' into for-davem
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
1  2 
net/rxrpc/ar-internal.h patch | diff1 | diff2 | blob | history
net/rxrpc/ar-output.c patch | diff1 | diff2 | blob | history

diff --cc net/rxrpc/ar-internal.h
Simple merge
diff --cc net/rxrpc/ar-output.c
Simple merge