summaryrefslogtreecommitdiffstats
path: root/include (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-07-301-0/+2
|\
| * xen/tracing: fix compile errors when tracing is disabled.Jeremy Fitzhardinge2011-07-261-0/+2
* | Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/l...Linus Torvalds2011-07-305-1/+105
|\ \
| * \ Merge branch 'imx/dt' into next/dtArnd Bergmann2011-07-28187-505/+2983
| |\ \
| | * | net: ibm_newemac: convert it to use of_get_phy_modeShawn Guo2011-07-271-1/+3
| | * | dt/net: add helper function of_get_phy_modeShawn Guo2011-07-271-0/+1
| * | | dt/irq: add irq_domain_generate_simple() helperGrant Likely2011-07-281-0/+10
| * | | irq: add irq_domain translation infrastructureGrant Likely2011-07-283-0/+91
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdogLinus Torvalds2011-07-301-0/+78
|\ \ \ \
| * | | | watchdog: WatchDog Timer Driver Core - Add minimum and max timeoutWim Van Sebroeck2011-07-281-0/+4
| * | | | watchdog: WatchDog Timer Driver Core - Add ioctl callWim Van Sebroeck2011-07-281-0/+2
| * | | | watchdog: WatchDog Timer Driver Core - Add nowayout featureWim Van Sebroeck2011-07-281-0/+1
| * | | | watchdog: WatchDog Timer Driver Core - Add Magic Close featureWim Van Sebroeck2011-07-281-0/+1
| * | | | watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIME...Wim Van Sebroeck2011-07-281-0/+4
| * | | | watchdog: WatchDog Timer Driver Core - Add WDIOC_SETOPTIONS ioctlWim Van Sebroeck2011-07-281-0/+1
| * | | | watchdog: WatchDog Timer Driver Core - Add basic ioctl functionalityWim Van Sebroeck2011-07-281-0/+4
| * | | | watchdog: WatchDog Timer Driver Core - Add basic frameworkWim Van Sebroeck2011-07-281-0/+61
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-07-282-2/+7
|\ \ \ \ \
| * | | | | net: add IFF_SKB_TX_SHARED flag to priv_flagsNeil Horman2011-07-281-0/+2
| * | | | | gro: Only reset frag0 when skb can be pulledHerbert Xu2011-07-271-1/+4
| * | | | | net: Convert struct net_device uc_promisc to boolJoe Perches2011-07-261-1/+1
* | | | | | Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2011-07-281-4/+10
|\ \ \ \ \ \
| * | | | | | md: load/store badblock list from v1.x metadataNeilBrown2011-07-281-4/+10
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-07-282-2/+124
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'linus' into nextJames Morris2011-06-3054-225/+479
| |\ \ \ \ \ \ \
| * | | | | | | | eCryptfs: export global eCryptfs definitions to include/linux/ecryptfs.hRoberto Sassu2011-06-271-0/+113
| * | | | | | | | encrypted-keys: add key format supportRoberto Sassu2011-06-271-2/+11
* | | | | | | | | Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-07-279-57/+81
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into devel and apply fixup from Stephen Rothwell:Stephen Rothwell2011-07-25227-1946/+4540
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | SUNRPC: Replace xprt->resend and xprt->sending with a priority queueTrond Myklebust2011-07-181-1/+0
| * | | | | | | | | SUNRPC: Allow caller of rpc_sleep_on() to select priority levelsTrond Myklebust2011-07-181-0/+4
| * | | | | | | | | SUNRPC: Support dynamic slot allocation for TCP connectionsTrond Myklebust2011-07-181-2/+7
| * | | | | | | | | SUNRPC: Clean up the slot table allocationTrond Myklebust2011-07-171-2/+0
| * | | | | | | | | SUNRPC: Ensure that we grab the XPRT_LOCK before calling xprt_alloc_slotTrond Myklebust2011-07-171-3/+3
| * | | | | | | | | SUNRPC: sunrpc should not explicitly depend on NFS config optionsTrond Myklebust2011-07-153-13/+13
| * | | | | | | | | NFS: Move the pnfs write code into pnfs.cTrond Myklebust2011-07-151-3/+0
| * | | | | | | | | NFS: Move the pnfs read code into pnfs.cTrond Myklebust2011-07-151-1/+0
| * | | | | | | | | NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is neededTrond Myklebust2011-07-151-1/+2
| * | | | | | | | | NFS: Cache rpc_ops in struct nfs_pageio_descriptorTrond Myklebust2011-07-151-0/+1
| * | | | | | | | | NFS: Clean up nfs_read_rpcsetup and nfs_write_rpcsetupTrond Myklebust2011-07-121-0/+2
| * | | | | | | | | NFSv4.1: Clean up layoutreturnTrond Myklebust2011-07-121-1/+2
| * | | | | | | | | pnfs-obj: pnfs_osd_xdr: Remove dead code and cleanupBoaz Harrosh2011-07-121-29/+2
| * | | | | | | | | NFSv4.1: Add an initialisation callback for pNFSTrond Myklebust2011-07-121-0/+1
| * | | | | | | | | NFS: Cleanup of the nfs_pageio code in preparation for a pnfs bugfixTrond Myklebust2011-07-121-3/+11
| * | | | | | | | | NFS: added FREE_STATEID callBryan Schumaker2011-07-122-0/+11
| * | | | | | | | | NFS: Added TEST_STATEID callBryan Schumaker2011-07-122-0/+11
| * | | | | | | | | NFS: Add SECINFO_NO_NAME procedureBryan Schumaker2011-07-122-0/+9
| * | | | | | | | | NFS: move pnfs layouts to nfs_server structureWeston Andros Adamson2011-07-121-1/+1
| * | | | | | | | | NFS: use scope from exchange_id to skip reclaimWeston Andros Adamson2011-07-122-0/+4
* | | | | | | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/...Linus Torvalds2011-07-272-8/+60
|\ \ \ \ \ \ \ \ \ \