projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9281b2a 42c1edd)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@conan.davemloft.net>
Fri, 17 Jun 2011 01:38:01 +0000 (21:38 -0400)
committerDavid S. Miller <davem@conan.davemloft.net>
Fri, 17 Jun 2011 01:38:01 +0000 (21:38 -0400)

Trivial merge
Domain: System / Kernel;