projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb52c7a 1a31a4a)
Merge branch 'nf' of git://1984.lsi.us.es/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 24 Dec 2011 21:10:26 +0000 (16:10 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Dec 2011 21:10:26 +0000 (16:10 -0500)

Trivial merge