projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ddb709 93840ac)
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
1  2 
net/batman-adv/translation-table.c patch | diff1 | diff2 | blob | history
net/batman-adv/types.h patch | diff1 | diff2 | blob | history

diff --cc net/batman-adv/translation-table.c
Simple merge
diff --cc net/batman-adv/types.h
Simple merge