projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3b084c 54b07dc)
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Dec 2011 18:16:59 +0000 (13:16 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Dec 2011 18:16:59 +0000 (13:16 -0500)

Trivial merge