projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fb9fb1 d232b8d)
Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Jun 2011 00:14:04 +0000 (17:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jun 2011 00:14:04 +0000 (17:14 -0700)

Trivial merge