summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2010-04-131-1/+1
|\
| * PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handlingJiri Slaby2010-04-101-1/+1
* | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-04-136-23/+39
|\ \
| * | NFSv4: fix delegated lockingTrond Myklebust2010-04-123-2/+6
| * | NFS: Ensure that the WRITE and COMMIT RPC calls are always uninterruptibleTrond Myklebust2010-04-091-7/+16
| * | NFS: Fix a race with the new commit codeTrond Myklebust2010-04-091-7/+10
| * | NFS: Ensure that writeback_single_inode() calls write_inode() when syncingTrond Myklebust2010-04-091-2/+2
| * | NFS: Fix the mode calculation in nfs_find_open_contextTrond Myklebust2010-04-091-4/+4
| * | NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIRTrond Myklebust2010-04-091-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2010-04-1317-135/+206
|\ \
| * | sparc64: Add some more commentary to __raw_local_irq_save()David S. Miller2010-04-131-0/+7
| * | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-04-134482-3286/+22501
| |\ \
| * | | sparc64: Fix memory leak in pci_register_iommu_region().David S. Miller2010-04-121-3/+8
| * | | sparc64: Add kmemleak annotation to sun4v_build_virq()David S. Miller2010-04-121-0/+8
| * | | sparc64: Support kmemleak.David S. Miller2010-04-122-1/+5
| * | | sparc64: Add function graph tracer support.David S. Miller2010-04-1210-15/+132
| * | | sparc64: Give a stack frame to the ftrace call sites.David S. Miller2010-04-121-15/+16
| * | | sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.David S. Miller2010-04-123-3/+3
| * | | sparc64: Remove profiling from some low-level bits.David S. Miller2010-04-121-1/+8
| * | | sparc64: Kill unnecessary static on local var in ftrace_call_replace().David S. Miller2010-04-121-1/+1
| * | | sparc64: Kill CONFIG_STACK_DEBUG code.David S. Miller2010-04-122-78/+1
| * | | sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up.David S. Miller2010-04-122-7/+16
| * | | sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs.David S. Miller2010-04-121-2/+12
| * | | sparc64: Use kstack_valid() in die_if_kernel().David S. Miller2010-04-121-23/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-04-1330-138/+348
|\ \ \ \ | |_|/ / |/| | |
| * | | smc91c92_cs: define multicast_table as unsigned charKen Kawasaki2010-04-131-7/+6
| * | | can: avoids a false warningEric Dumazet2010-04-131-1/+1
| * | | e1000e: stop cleaning when we reach tx_ring->next_to_useTerry Loftin2010-04-131-0/+2
| * | | igb: restrict WoL for 82576 ET2 Quad Port Server AdapterStefan Assmann2010-04-132-0/+2
| * | | virtio_net: missing sg_init_tableShirley Ma2010-04-121-0/+2
| * | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-04-114636-6193/+13245
| |\ \ \ | | | |/ | | |/|
| * | | Revert "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb"David S. Miller2010-04-111-1/+0
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-04-091-4/+9
| |\ \ \
| | * | | iwlwifi: need check for valid qos packet before freeWey-Yi Guy2010-04-081-4/+9
| * | | | tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skbDavid S. Miller2010-04-081-0/+1
| * | | | udp: fix for unicast RX path optimizationJorge Boncompte [DTI2]2010-04-082-4/+4
| * | | | myri10ge: fix rx_pause in myri10ge_set_pauseparamBrice Goglin2010-04-071-1/+1
| * | | | net: corrected documentation for hardware time stampingPatrick Loschmidt2010-04-071-30/+46
| * | | | stmmac: use resource_size()Dan Carpenter2010-04-071-5/+5
| * | | | x.25 attempts to negotiate invalid throughputJohn Hughes2010-04-072-7/+28
| * | | | x25: Patch to fix bug 15678 - x25 accesses fields beyond end of packet.John Hughes2010-04-074-6/+72
| * | | | bridge: Fix IGMP3 report parsingHerbert Xu2010-04-071-1/+1
| * | | | cnic: Fix crash during bnx2x MTU change.Michael Chan2010-04-071-5/+5
| * | | | Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostDavid S. Miller2010-04-071-0/+4
| |\ \ \ \
| | * | | | vhost-net: fix vq_memory_access_ok error checkingJeff Dike2010-04-071-0/+4
| * | | | | qlcnic: fix set mac addrAmit Kumar Salecha2010-04-071-0/+3
| * | | | | r6040: fix r6040_multicast_listFlorian Fainelli2010-04-071-7/+4
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-04-079-60/+153
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | ath9k: fix double calls to ath_radio_enableFelix Fietkau2010-04-061-2/+1
| | * | | | mac80211: annotate station rcu dereferencesJohannes Berg2010-04-062-6/+18