git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8303e69 cb28ea3)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 7 Apr 2013 22:37:01 +0000 (18:37 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 7 Apr 2013 22:37:01 +0000 (18:37 -0400)
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

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

Trivial merge
Pandora Kernel Repository