Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

author	David S. Miller <davem@davemloft.net>
	Fri, 23 Dec 2011 22:13:56 +0000 (17:13 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 23 Dec 2011 22:13:56 +0000 (17:13 -0500)
commit	abb434cb0539fb355c1c921f8fd761efbbac3462
tree	24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6	tree \| snapshot
parent	2494654d4890316e7340fb8b3458daad0474a1b9	commit \| diff
parent	6350323ad8def2ac00d77cdee3b79c9b9fba75c4	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/tile/tilepro.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/asix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
include/net/dst.h	diff1 \|	diff2 \|	blob \| history
include/net/flow.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/tile/tilepro.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/asix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
include/net/dst.h	diff1 \|	diff2 \|	blob \| history
include/net/flow.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history