aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2007-07-24
|\
| * [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.SAtsushi Nemoto2007-07-24
| * [MIPS] ARC: Remove unused arch/mips/arc/console.cYoichi Yuasa2007-07-24
| * [MIPS] SNI: snipromThomas Bogendoerfer2007-07-24
| * [MIPS] Jazz: remove unneeded reset functionsYoichi Yuasa2007-07-24
| * [MIPS] Whitespace cleanup.Ralf Baechle2007-07-24
| * [MIPS] Make resources for ds1742 "static __initdata"Atsushi Nemoto2007-07-24
| * [MIPS] Replace __attribute_used__ with __usedDavid Rientjes2007-07-24
| * [MIPS] Jazz: Remove unused arch/mips/jazz/io.cYoichi Yuasa2007-07-24
| * [MIPS] Mark prom_free_prom_memory as __init_refokAtsushi Nemoto2007-07-24
| * [MIPS] MIPSsim: Fix cflagsYoichi Yuasa2007-07-24
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-24
|\ \
| * | pata_hpt37x: Fix 2.6.22 clock PLL regressionAlan Cox2007-07-24
| * | pata_ali: Correct HP detectAlan Cox2007-07-24
| * | ata_piix: fix suspend/resume for some TOSHIBA laptopsTejun Heo2007-07-24
| * | PCI: export __pci_reenable_device()Tejun Heo2007-07-24
| |/
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-24
|\ \
| * | netdev: i82596 Ethernet needs <asm/cacheflush.h>Geert Uytterhoeven2007-07-24
| * | forcedeth: mcp73 device additionAyaz Abdulla2007-07-24
| * | forcedeth: new device ids in pci_ids.hAyaz Abdulla2007-07-24
| * | atl1: make atl1_init_ring_ptrs staticChris Snook2007-07-24
| * | eHEA: net_poll supportJan-Bernd Themann2007-07-24
| * | drivers/net/acenic.c: fix check-after-useAdrian Bunk2007-07-24
| * | defxx: Use __maybe_unused rather than a local hackMaciej W. Rozycki2007-07-24
| * | Fix error checking in Vitesse IRQ configAndy Fleming2007-07-24
| * | ps3: reduce allocation size of rx skb buffersMasakazu Mokuno2007-07-24
| * | atl1: use kernel provided ethernet length constantsJay Cliburn2007-07-24
| * | atl1: fix typo in dma_req_blockJay Cliburn2007-07-24
| * | atl1: change cmb write thresholdJay Cliburn2007-07-24
| * | atl1: fix typo in DMA engine setupJay Cliburn2007-07-24
| * | atl1: change tpd_avail function nameJay Cliburn2007-07-24
| * | ps3: fix rare issue that reenabling rx DMA failsMasakazu Mokuno2007-07-24
| * | ps3: removed calling netif_poll_enable() in open()Masakazu Mokuno2007-07-24
| * | ps3: use ethX as the name of irqMasakazu Mokuno2007-07-24
| * | ps3: use net_device_stats of net_device structureMasakazu Mokuno2007-07-24
| * | ps3: removed conditional ethtool supportMasakazu Mokuno2007-07-24
| * | ps3: removed defines no longer usedMasakazu Mokuno2007-07-24
| * | ps3: tx descriptor handling cleanupMasakazu Mokuno2007-07-24
| * | ps3: some minor cleanupsMasakazu Mokuno2007-07-24
| * | ps3: fix wrong calculation of rx descriptor addressMasakazu Mokuno2007-07-24
| * | netxen: Load firmware during probe, dma watchdog fix.dhananjay@netxen.com2007-07-24
| * | ucc_geth: add support to netif message levelLi Yang2007-07-24
| * | ucc_geth: add ethtool supportLi Yang2007-07-24
| |/
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp...Linus Torvalds2007-07-24
|\ \
| * | [SPARC64]: Mark most of initial bootup asm as .text.init.ref_okDavid S. Miller2007-07-24
| * | [SPARC32]: Fix bug in sparc optimized memset.Alexander Shmelev2007-07-24
| * | [SPARC64]: Update defconfig.David S. Miller2007-07-24
| * | [SPARC]: Add missing NOTES section.David S. Miller2007-07-24
| * | [SPARC32]: missing exportsAl Viro2007-07-24
| * | [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.Al Viro2007-07-24