projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 684bad1 ace1fe1)
Merge branch 'master' of git://1984.lsi.us.es/nf-next
authorDavid S. Miller <davem@davemloft.net>
Tue, 4 Sep 2012 00:26:45 +0000 (20:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Sep 2012 00:26:45 +0000 (20:26 -0400)

Trivial merge