summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2013-12-307-34/+60
|\
| * Merge remote-tracking branch 'agust/merge' into mergeBenjamin Herrenschmidt2013-12-301-1/+5
| |\
| | * powerpc/512x: dts: disable MPC5125 usb moduleMatteo Facchinetti2013-12-201-0/+5
| | * powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node (5125)Gerhard Sittig2013-12-181-1/+0
| * | powerpc: Fix alignment of secondary cpu spin varsOlof Johansson2013-12-301-0/+1
| * | powerpc: Align p_endAnton Blanchard2013-12-301-0/+1
| * | powernv/eeh: Add buffer for P7IOC hub error dataBrian W Hart2013-12-302-14/+5
| * | powernv/eeh: Fix possible buffer overrun in ioda_eeh_phb_diag()Brian W Hart2013-12-301-2/+3
| * | powerpc: Make 64-bit non-VMX __copy_tofrom_user bi-endianPaul E. McKenney2013-12-301-15/+38
| * | powerpc: Make unaligned accesses endian-safe for powerpcRajesh B Prathipati2013-12-301-1/+6
| * | powerpc: Fix bad stack check in exception entryMichael Neuling2013-12-301-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-12-3082-442/+967
|\ \
| * | stmmac: Fix incorrect spinlock release and PTP cap detection.Vince Bridgers2013-12-302-13/+11
| * | phy: IRQ cannot be sharedSergei Shtylyov2013-12-301-4/+2
| * | net: rose: restore old recvmsg behaviorFlorian Westphal2013-12-301-12/+4
| * | xen-netback: fix guest-receive-side array sizesPaul Durrant2013-12-303-7/+24
| * | fec: Do not assume that PHY reset is active lowFabio Estevam2013-12-301-4/+10
| * | tipc: fix deadlock during socket releaseYing Xue2013-12-303-48/+49
| * | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2013-12-2911-105/+177
| |\ \
| | * | batman-adv: fix vlan header accessAntonio Quartulli2013-12-281-1/+1
| | * | batman-adv: clean nf state when removing protocol headerAntonio Quartulli2013-12-281-0/+5
| | * | batman-adv: fix alignment for batadv_tvlv_tt_changeAntonio Quartulli2013-12-282-4/+6
| | * | batman-adv: fix size of batadv_bla_claim_dstSimon Wunderlich2013-12-281-0/+2
| | * | batman-adv: fix size of batadv_icmp_headerAntonio Quartulli2013-12-283-14/+44
| | * | batman-adv: fix header alignment by unrolling batadv_headerSimon Wunderlich2013-12-2810-85/+118
| | * | batman-adv: fix alignment for batadv_coded_packetSimon Wunderlich2013-12-281-2/+2
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-12-296-8/+33
| |\ \ \ | | |/ / | |/| |
| | * | netfilter: nf_tables: fix wrong datatype in nft_validate_data_load()Pablo Neira Ayuso2013-12-281-1/+3
| | * | netfilter: nf_tables: fix oops when updating table with user chainsPablo Neira Ayuso2013-12-281-2/+10
| | * | netfilter: nf_tables: fix dumping with large number of setsPablo Neira Ayuso2013-12-281-3/+7
| | * | ipvs: correct usage/allocation of seqadj ext in ipvsJesper Dangaard Brouer2013-12-271-0/+6
| | * | netfilter: WARN about wrong usage of sequence number adjustmentsJesper Dangaard Brouer2013-12-271-0/+5
| | * | netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletionHelmut Schaa2013-12-201-1/+0
| | * | netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offsetDaniel Borkmann2013-12-201-1/+1
| | * | netfilter: nfnetlink_log: unset nf_loggers for netns when unloading moduleGao feng2013-12-171-0/+1
| * | | ipv6: release dst properly in ipip6_tunnel_xmitLi RongQing2013-12-271-1/+3
| * | | netxen: Correct off-by-one errors in bounds checksDavid Gibson2013-12-271-2/+2
| * | | net: Add some clarification to skb_tx_timestamp() comment.David S. Miller2013-12-271-0/+4
| * | | arc_emac: fix potential use after freeEric Dumazet2013-12-271-2/+2
| * | | tg3: Expand 4g_overflow_test workaround to skb fragments of any size.Nithin Sujir2013-12-271-1/+1
| * | | net_sched: act: Dont increment refcnt on replaceJamal Hadi Salim2013-12-278-26/+37
| * | | rds: prevent dereference of a NULL deviceSasha Levin2013-12-271-1/+2
| * | | macvlan: fix netdev feature propagation from lower deviceFlorian Westphal2013-12-261-3/+13
| * | | ipv4: consistent reporting of pmtu data in case of corkingHannes Frederic Sowa2013-12-231-2/+3
| * | | drivers: net : cpsw: pass proper device name while requesting irqMugunthan V N2013-12-231-1/+1
| * | | Merge branch 'cxgb4'David S. Miller2013-12-238-80/+301
| |\ \ \
| | * | | RDMA/cxgb4: Use cxgb4_select_ntuple to correctly calculate ntuple fieldsKumar Sanghvi2013-12-231-54/+17
| | * | | RDMA/cxgb4: Server filters are supported only for IPv4Kumar Sanghvi2013-12-231-1/+2
| | * | | RDMA/cxgb4: Calculate the filter server TID properlyKumar Sanghvi2013-12-231-3/+1
| | * | | cxgb4: Add API to correctly calculate tuple fieldsKumar Sanghvi2013-12-236-16/+235