summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUXEric Paris2009-09-151-1/+1
* Creds: creds->security can be NULL is selinux is disabledEric Paris2009-09-142-5/+17
* Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-09-118-22/+120
|\
| * Merge branch 'nfs-for-2.6.32'Trond Myklebust2009-09-118-22/+120
| |\
| | * NFS: Allow the "nfs" file system type to support NFSv4Chuck Lever2009-09-081-0/+1
| | * nfs: fix compile error in rpc_pipefs.hJ. Bruce Fields2009-08-201-0/+2
| | * Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32Trond Myklebust2009-08-197-48/+224
| | |\
| | | * sunrpc: ntoh -> be*_to_cpuBenny Halevy2009-08-141-3/+2
| | | * sunrpc: hton -> cpu_to_be*Benny Halevy2009-08-141-3/+2
| | * | Merge branch 'sunrpc_cache-for-2.6.32' into nfs-for-2.6.32Trond Myklebust2009-08-103-13/+50
| | |\ \
| | | * | SUNRPC: Add an rpc_pipefs front end for the sunrpc cache codeTrond Myklebust2009-08-092-0/+21
| | | * | SUNRPC: Move procfs-specific stuff out of the generic sunrpc cache codeTrond Myklebust2009-08-091-2/+9
| | | * | SUNRPC: Allow the cache_detail to specify alternative upcall mechanismsTrond Myklebust2009-08-091-3/+10
| | | * | NFSD: Clean up the idmapper warning...Trond Myklebust2009-08-091-1/+2
| | | * | SUNRPC: clean up rpc_setup_pipedir()Trond Myklebust2009-08-092-2/+1
| | | * | SUNRPC: Replace rpc_client->cl_dentry and cl_mnt, with a cl_pathTrond Myklebust2009-08-091-2/+2
| | | * | SUNRPC: Rename rpc_mkdir to rpc_create_client_dir()Trond Myklebust2009-08-091-2/+3
| | | * | SUNRPC: Constify rpc_pipe_ops...Trond Myklebust2009-08-091-2/+3
| | * | | Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32Trond Myklebust2009-08-103-3/+54
| | |\ \ \
| | | * | | SUNRPC: Kill RPC_DISPLAY_ALLChuck Lever2009-08-091-1/+0
| | | * | | SUNRPC: Remove duplicate universal address generationChuck Lever2009-08-091-1/+0
| | | * | | SUNRPC: Provide functions for managing universal addressesChuck Lever2009-08-091-0/+38
| | | * | | SUNRPC: Clean up RPCBIND_MAXUADDRLEN definitionsChuck Lever2009-08-091-1/+16
| | | |/ /
| | * / / NFSv4: Add 'server capability' flags for NFSv4 recommended attributesTrond Myklebust2009-08-091-0/+9
| | |/ /
* | | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-09-114-4/+52
|\ \ \ \
| * | | | pata_cs5535: add pci id for AMD based CS5535 controllersOtavio Salvador2009-09-111-0/+1
| * | | | ahci: Add AMD SB900 SATA/IDE controller device IDsShane Huang2009-09-111-0/+3
| * | | | dmi: extend dmi_get_year() to dmi_get_date()Tejun Heo2009-09-081-2/+11
| * | | | libata: remove spindown skipping and warningTejun Heo2009-09-011-1/+0
| * | | | libata: add command name parsing for error outputRobert Hancock2009-09-011-1/+31
| * | | | [libata] add DMA setup FIS auto-activate featureShaohua Li2009-09-012-0/+6
* | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2009-09-1112-89/+518
|\ \ \ \ \
| * \ \ \ \ Merge commit 'v2.6.31-rc9' into tracing/coreIngo Molnar2009-09-0627-78/+161
| |\ \ \ \ \
| * | | | | | ring-buffer: only enable ring_buffer_swap_cpu when neededSteven Rostedt2009-09-041-0/+9
| * | | | | | tracing: pass around ring buffer instead of tracerSteven Rostedt2009-09-042-10/+20
| * | | | | | ring-buffer: remove ring_buffer_event_discardSteven Rostedt2009-09-041-14/+0
| * | | | | | tracing/filters: Defer pred allocationLi Zefan2009-08-313-4/+0
| * | | | | | tracing: Fix double CPP substitution in TRACE_EVENT_FNFrederic Weisbecker2009-08-281-6/+7
| * | | | | | tracing: Undef TRACE_EVENT_FN between trace events headers inclusionFrederic Weisbecker2009-08-271-0/+1
| * | | | | | Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/...Ingo Molnar2009-08-265-45/+102
| |\ \ \ \ \ \
| | * | | | | | tracing: Create generic syscall TRACE_EVENTsJosh Stone2009-08-262-17/+70
| | * | | | | | tracing: Move tracepoint callbacks from declaration to definitionJosh Stone2009-08-264-36/+36
| | * | | | | | tracing: Make syscall tracepoints conditionalJosh Stone2009-08-261-0/+4
| * | | | | | | tracing: add comments to explain TRACE_EVENT out of protectionSteven Rostedt2009-08-261-2/+11
| * | | | | | | tracing/events: fix the include file dependenciesXiao Guangrong2009-08-262-2/+2
| * | | | | | | tracing/filters: Support filtering for char * stringsLi Zefan2009-08-261-0/+1
| * | | | | | | tracing/filters: Add __field_ext() to TRACE_EVENTLi Zefan2009-08-262-8/+32
| * | | | | | | tracing/sched: show CPU task wakes up on in trace eventSteven Rostedt2009-08-261-4/+8
| |/ / / / / /
| * | | | | | tracing/syscalls: Add filtering supportLi Zefan2009-08-193-7/+21
| * | | | | | tracing/events: Add trace_define_common_fields()Li Zefan2009-08-192-12/+4