git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcebcc4 bb3c368)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 07:11:14 +0000 (02:11 -0500)
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c


Trivial merge
Pandora Kernel Repository