aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2006-07-05
|\
| * Merge branch 'locks'Trond Myklebust2006-07-05
| |\
| | * NLM,NFSv4: Wait on local locks before we put RPC calls on the wireTrond Myklebust2006-07-05
| | * VFS: Add support for the FL_ACCESS flag to flock_lock_file()Trond Myklebust2006-07-05
| | * NFSv4: Ensure nfs4_lock_expired() caches delegated locksTrond Myklebust2006-07-05
| | * NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lockTrond Myklebust2006-07-05
| | * VFS: Allow caller to determine if BSD or posix locks were actually freedTrond Myklebust2006-07-05
| * | NFS: Optimise away an excessive GETATTR call when a file is symlinkedTrond Myklebust2006-07-05
| * | This fixes a panic doing the first READDIR or READDIRPLUS call when:Trond Myklebust2006-07-05
| * | NFS: Fix NFS page_state usageTrond Myklebust2006-07-05
| |/
| * Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-07-05
| |\
| * \ Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-07-03
| |\ \
| * \ \ Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-06-28
| |\ \ \
| * | | | Revert "Merge branch 'odirect'"Trond Myklebust2006-06-28
* | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-07-05
|\ \ \ \ \
| * | | | | [ARM] 3711/1: AT91 timer updateAndrew Victor2006-07-05
| * | | | | [ARM] 3709/1: pnx4008: convert to generic irq subsystemVitaly Wool2006-07-05
| * | | | | [ARM] 3710/1: AT91 Serial: Use GPIO APIAndrew Victor2006-07-05
| | |_|_|/ | |/| | |
* | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-07-05
|\ \ \ \ \
| * | | | | [PATCH] myri10ge - Export more parameters to ethtoolBrice Goglin2006-07-05
| * | | | | [PATCH] myri10ge - Use dev_info() when printing parameters after probeBrice Goglin2006-07-05
| * | | | | [PATCH] myri10ge - Drop ununsed nvidia chipset idbrice@myri.com2006-07-05
| * | | | | [PATCH] myri10ge - Drop unused pm_statebrice@myri.com2006-07-05
| * | | | | [PATCH] Fix freeing of net deviceRalf Baechle2006-07-05
| * | | | | [PATCH] remove dead entry in net wan KconfigPaul Fulghum2006-07-05
| * | | | | [PATCH] NI5010 netcard cleanupAndreas Mohr2006-07-05
| * | | | | [PATCH] lock validator: fix ns83820.c irq-flags bugIngo Molnar2006-07-05
| * | | | | [PATCH] pcnet32: Cleanup rx buffers after loopback test.Don Fry2006-07-05
| * | | | | [PATCH] pcnet32: Suspend the chip rather than restart when changing multicast...Don Fry2006-07-05
| * | | | | [PATCH] pcnet32: Handle memory allocation failures cleanly when resizing tx/r...Don Fry2006-07-05
| * | | | | [PATCH] pcnet32: Use kcalloc instead of kmalloc and memsetDon Fry2006-07-05
| * | | | | [PATCH] pcnet32: Fix off-by-one in get_ringparamDon Fry2006-07-05
| * | | | | [PATCH] pcnet32: Use PCI_DEVICE macroDon Fry2006-07-05
| * | | | | [PATCH] pcnet32: Fix Section mismatch errorDon Fry2006-07-05
| * | | | | [PATCH] Add support for the Cicada 8201 PHYKim Phillips2006-07-05
| * | | | | [PATCH] zd1211rw: disable TX queue during stopDaniel Drake2006-07-05
| * | | | | [PATCH] ZyDAS ZD1211 USB-WLAN driverDaniel Drake2006-07-05
| * | | | | [PATCH] softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549John W. Linville2006-07-05
| * | | | | [PATCH] CONFIG_WIRELESS_EXT is neccessary after allHorms2006-07-05
| * | | | | [PATCH] SoftMAC: Add network to ieee80211softmac_call_events when associate t...Joseph Jezak2006-07-05
| * | | | | [PATCH] SoftMAC: Prevent multiple authentication attempts on the same networkJoseph Jezak2006-07-05
| * | | | | [PATCH] bcm43xx: enable shared key authenticationDaniel Drake2006-07-05
| * | | | | [PATCH] 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211...Larry Finger2006-07-05
| * | | | | [PATCH] Convert bcm43xx-softmac to use the ieee80211_is_valid_channel routineLarry Finger2006-07-05
| * | | | | [PATCH] skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.cEric Sesterhenn2006-07-05
| * | | | | [PATCH] ieee80211: fix not allocating IV+ICV space when usingencryption in ie...Hong Liu2006-07-05
| * | | | | [PATCH] bcm43xx: workaround init_board vs. IRQ raceMichael Buesch2006-07-05
| * | | | | [PATCH] bcm43xx: use softmac-suggested TX rateDaniel Drake2006-07-05
| * | | | | [PATCH] Add two PLX device IDsFaidon Liambotis2006-07-05
| * | | | | [netdrvr] use dev_xxx() printk helpers, rather than dev_printk(KERN_xxx, ...Jeff Garzik2006-07-05