summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: stmmac: fix bad merge conflict resolutionOlof Johansson2013-09-061-0/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ideLinus Torvalds2013-09-067-11/+13
|\
| * ide: sgiioc4: Staticize ioc4_ide_attach_one()Jingoo Han2013-09-051-1/+1
| * ide: palm_bk3710: add missing __iomem annotationJingoo Han2013-09-051-2/+2
| * ide: use dev_get_platdata()Jingoo Han2013-09-053-4/+4
| * ide-disk_proc: use macro to replace magic numberXinghai Yu2013-09-051-2/+2
| * ide: replace strict_strtol() with kstrtol()Jingoo Han2013-09-051-2/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2013-09-0613-35/+49
|\ \
| * | sparc64: Export flush_ptrace_access() (needed by lustre)Geert Uytterhoeven2013-09-051-0/+2
| * | sparc: fix PCI device proc file mmap(2)Alexey Dobriyan2013-09-051-0/+16
| * | sparc64: Remove RWSEM export leftoversKirill Tkhai2013-09-051-9/+0
| * | sparc64: Fix off by one in trampoline TLB mapping installation loop.David S. Miller2013-08-231-2/+0
| * | sparc64: Fix ITLB handler of null pageKirill Tkhai2013-08-031-2/+1
| * | esp_scsi: Fix tag state corruption when autosensing.David S. Miller2013-08-022-6/+9
| * | sparc64: Fix not SRA'ed %o5 in 32-bit traced syscallKirill Tkhai2013-08-011-4/+4
| * | sparc64: cleanup: Rename ret_from_syscall to ret_from_forkKirill Tkhai2013-08-013-6/+6
| * | sparc32: Fix exit flag passed from traced sys_sigreturnKirill Tkhai2013-08-011-1/+1
| * | sparc64: Fix wrong syscall return value passed to trace_sys_exit()Kirill Tkhai2013-08-011-1/+1
| * | support sparc64x chip type in cpumap.cAllen Pais2013-08-011-0/+1
| * | cpu hw caps support for sparc64xAllen Pais2013-08-011-4/+8
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-05974-23917/+56727
|\ \ \
| * | | openvswitch: Fix alignment of struct sw_flow_key.Jesse Gross2013-09-052-1/+2
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-09-05143-684/+1483
| |\ \ \
| | * | | tcp: Add missing braces to do_tcp_setsockoptDave Jones2013-09-051-1/+2
| | * | | caif: Add missing braces to multiline if in cfctrl_linkup_requestDave Jones2013-09-051-1/+2
| | * | | bnx2x: Add missing braces in bnx2x:bnx2x_link_initializeDave Jones2013-09-051-1/+2
| | * | | vxlan: Fix kernel panic on device delete.Pravin B Shelar2013-09-051-1/+2
| | * | | net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctlsThomas Petazzoni2013-09-051-0/+16
| | * | | net: mvneta: properly disable HW PHY polling and ensure adjust_link() worksThomas Petazzoni2013-09-051-1/+12
| | * | | sh_eth: fix napi_{en|dis}able() calls racing against interruptsSergei Shtylyov2013-09-041-5/+7
| | * | | net: ipv6: tcp: fix potential use after free in tcp_v6_do_rcvDaniel Borkmann2013-09-041-1/+1
| | * | | ipv6: Don't depend on per socket memory for neighbour discovery messagesThomas Graf2013-09-041-6/+8
| | * | | net: fec: fix the error to get the previous BD entryDuan Fugang-B386112013-09-042-46/+77
| | * | | ipv6: fix null pointer dereference in __ip6addrlbl_addHannes Frederic Sowa2013-09-041-25/+23
| | * | | sh_eth: NAPI requires netif_receive_skb()Sergei Shtylyov2013-09-041-1/+1
| | * | | drivers: net: ethernet: 8390: Kconfig: add H8300H_AKI3068NET and H8300H_H8MAX...Chen Gang2013-09-041-1/+1
| | * | | tg3: Don't turn off led on 5719 serdes port 0Nithin Sujir2013-09-041-2/+16
| | * | | Merge branch 'calxedaxgmac'David S. Miller2013-09-041-79/+116
| | |\ \ \
| | | * | | net: calxedaxgmac: fix xgmac_xmit DMA mapping error handlingRob Herring2013-09-041-5/+26
| | | * | | net: calxedaxgmac: fix rx DMA mapping API size mismatchesRob Herring2013-09-041-6/+12
| | | * | | net: calxedaxgmac: remove some unused statistic countersRob Herring2013-09-041-3/+0
| | | * | | net: calxedaxgmac: fix various errors in xgmac_set_rx_modeRob Herring2013-09-041-4/+13
| | | * | | net: calxedaxgmac: enable interrupts after napi_enableRob Herring2013-09-041-3/+5
| | | * | | net: calxedaxgmac: fix race with tx queue stop/wakeRob Herring2013-09-041-5/+15
| | | * | | net: calxedaxgmac: update ring buffer tx_head after barriersRob Herring2013-09-041-1/+2
| | | * | | net: calxedaxgmac: fix possible skb free before tx completeRob Herring2013-09-041-31/+24
| | | * | | net: calxedaxgmac: fix race between xgmac_tx_complete and xgmac_tx_errRob Herring2013-09-041-20/+18
| | | * | | net: calxedaxgmac: read correct field in xgmac_desc_get_buf_lenRob Herring2013-09-041-1/+1
| | | * | | net: calxedaxgmac: remove NETIF_F_FRAGLIST settingRob Herring2013-09-041-1/+1
| | |/ / /
| | * | | ipv6: ipv6_create_tempaddr cleanupPetr Holasek2013-09-041-2/+0