projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 263fb5b 7c9989a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Feb 2011 20:39:12 +0000 (12:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Feb 2011 20:39:12 +0000 (12:39 -0800)

Trivial merge