summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2008-06-146-32/+79
|\
| * PCI: fixup write combine comment in pci_mmap_resourceJesse Barnes2008-06-121-1/+0
| * Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git...Jesse Barnes2008-06-126-31/+79
| |\
| | * x86: PAT export resource_wc in pci sysfsvenkatesh.pallipadi@intel.com2008-06-123-22/+64
| | * x86, pci-dma.c: don't always add __GFP_NORETRY to gfpMiquel van Smoorenburg2008-06-101-3/+10
| | * suspend-vs-iommu: prevent suspend if we could not resumePavel Machek2008-06-021-1/+30
| | * x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRYMiquel van Smoorenburg2008-06-021-4/+3
| | * pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)Bertram Felgenhauer2008-06-021-0/+7
| | * PCI: use dev_to_node in pci_call_probeYinghai Lu2008-05-241-1/+1
| | * PCI: Correct last two HP entries in the bfsort whitelistTony Camuso2008-05-221-4/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2008-06-1317-33/+30
|\ \ \
| * | | parisc: update my email addressKyle McMartin2008-06-131-4/+4
| * | | parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3Kyle McMartin2008-06-131-1/+1
| * | | parisc: fix off by one in setup_sigcontext32Kyle McMartin2008-06-131-2/+2
| * | | parisc: export empty_zero_pageKyle McMartin2008-06-131-0/+1
| * | | parisc: export copy_user_page_asmKyle McMartin2008-06-131-0/+3
| * | | parisc: move head.S to head.text sectionKyle McMartin2008-06-132-1/+3
| * | | Revert "parisc: fix trivial section name warnings"Kyle McMartin2008-06-1311-27/+18
* | | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-06-131-25/+112
|\ \ \ \
| * | | | ahci: Workaround HW bug for SB600/700 SATA controller PMP supportShane Huang2008-06-131-17/+82
| * | | | ahci: workarounds for mcp65Tejun Heo2008-06-131-9/+31
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-06-1340-228/+130
|\ \ \ \
| * | | | tcp: Revert 'process defer accept as established' changes.David S. Miller2008-06-129-98/+33
| * | | | ipv6: Fix duplicate initialization of rawv6_prot.destroyDavid S. Miller2008-06-121-2/+2
| * | | | bnx2x: Updating the MaintainerEilon Greenstein2008-06-124-6/+9
| * | | | net: Eliminate flush_scheduled_work() calls while RTNL is held.David S. Miller2008-06-129-47/+21
| * | | | Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga...David S. Miller2008-06-113-4/+4
| |\ \ \ \
| | * | | | drivers/net/r6040.c: correct bad use of round_jiffies()Christophe Jaillet2008-06-111-1/+1
| | * | | | fec_mpc52xx: MPC52xx_MESSAGES_DEFAULT: 2nd NETIF_MSG_IFDOWN => IFUPRoel Kluin2008-06-111-1/+1
| | * | | | ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_...Roel Kluin2008-06-111-2/+2
| * | | | | Merge branch 'net-2.6-misc-20080611a' of git://git.linux-ipv6.org/gitroot/yos...David S. Miller2008-06-113-6/+19
| |\ \ \ \ \
| | * | | | | ipv6: Fail with appropriate error code when setting not-applicable sockopt.YOSHIFUJI Hideaki2008-06-121-4/+4
| | * | | | | ipv6: Check IPV6_MULTICAST_LOOP option value.YOSHIFUJI Hideaki2008-06-121-0/+2
| | * | | | | ipv6: Check the hop limit setting in ancillary data.Shan Wei2008-06-121-0/+5
| | * | | | | ipv6 route: Fix route lifetime in netlink message.YOSHIFUJI Hideaki2008-06-121-2/+6
| | * | | | | ipv6 mcast: Check address family of gf_group in getsockopt(MS_FILTER).YOSHIFUJI Hideaki2008-06-121-0/+2
| | |/ / / /
| * | | | | Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6David S. Miller2008-06-119-59/+41
| |\ \ \ \ \
| | * | | | | dccp: Bug in initial acknowledgment number assignmentGerrit Renker2008-06-111-4/+4
| | * | | | | dccp ccid-3: X truncated due to type conversionGerrit Renker2008-06-111-8/+6
| | * | | | | dccp ccid-3: TFRC reverse-lookup Bug-FixGerrit Renker2008-06-111-4/+4
| | * | | | | dccp ccid-2: Bug-Fix - Ack Vectors need to be ignored on request socketsGerrit Renker2008-06-111-1/+3
| | * | | | | dccp: Fix sparse warningsGerrit Renker2008-06-116-40/+16
| | * | | | | dccp ccid-3: Bug-Fix - Zero RTT is possibleGerrit Renker2008-06-111-2/+8
| | |/ / / /
| * | | | | netfilter: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info()Patrick McHardy2008-06-111-2/+1
| * | | | | netfilter: Make nflog quiet when no one listen in userspace.Eric Leblond2008-06-111-4/+0
| |/ / / /
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-06-131-32/+26
|\ \ \ \ \
| * | | | | sparc: get leo framebuffer workingRobert Reif2008-06-101-32/+26
* | | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-06-123-4/+9
|\ \ \ \ \ \
| * | | | | | [ARM] 5091/1: Add missing bitfield include to regs-lcd.hStefan Schmidt2008-06-121-1/+4
| * | | | | | [ARM] 5090/1: Correct pxafb palette typo errorJürgen Schindele2008-06-111-2/+4