git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee9c799 0e255f1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 May 2013 23:48:28 +0000 (16:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 May 2013 23:48:28 +0000 (16:48 -0700)
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
Pandora Kernel Repository