summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-blockLinus Torvalds2012-01-155-93/+252
|\
| * block: Stop using macro stubs for the bio data integrity callsMartin K. Petersen2012-01-131-13/+53
| * blockdev: convert some macros to static inlinesStephen Rothwell2012-01-121-13/+64
| * block: Add BLKROTATIONAL ioctlMartin K. Petersen2012-01-111-0/+1
| * block: Introduce blk_set_stacking_limits functionMartin K. Petersen2012-01-111-0/+1
| * block, cfq: move icq creation and rq->elv.icq association to block coreTejun Heo2011-12-142-4/+63
| * block, cfq: restructure io_cq creation path for io_context interface cleanupTejun Heo2011-12-141-0/+2
| * block, cfq: move io_cq exit/release to blk-ioc.cTejun Heo2011-12-142-6/+19
| * block, cfq: move icq cache management to block coreTejun Heo2011-12-141-1/+10
| * block, cfq: move cfqd->icq_list to request_queue and add request->elv.icqTejun Heo2011-12-141-2/+8
| * block, cfq: reorganize cfq_io_context into generic and cfq specific partsTejun Heo2011-12-141-29/+14
| * block: remove elevator_queue->opsTejun Heo2011-12-141-3/+2
| * block, cfq: kill cic->keyTejun Heo2011-12-141-1/+0
| * block, cfq: kill ioc_goneTejun Heo2011-12-141-17/+0
| * block, cfq: remove delayed unlinkTejun Heo2011-12-141-1/+0
| * block, cfq: unlink cfq_io_context's immediatelyTejun Heo2011-12-142-4/+11
| * block, cfq: move ioc ioprio/cgroup changed handling to cicTejun Heo2011-12-141-5/+9
| * block, cfq: misc updates to cfq_io_contextTejun Heo2011-12-141-0/+1
| * block: misc updates to blk_get_queue()Tejun Heo2011-12-141-1/+1
| * block: make ioc get/put interface more conventional and fix race on alloctionTejun Heo2011-12-141-2/+2
| * block: misc ioc cleanupsTejun Heo2011-12-141-9/+3
| * block, cfq: move cfqd->cic_index to q->idTejun Heo2011-12-141-0/+6
| * block: add blk_queue_dead()Tejun Heo2011-12-141-0/+1
| * block, sx8: kill blk_insert_request()Tejun Heo2011-12-141-1/+0
* | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-01-152-5/+77
|\ \
| * \ Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2012-01-0814-15/+76
| |\ \
| * \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2012-01-082-5/+77
| |\ \ \
| | * | | tracing: Fix compile error when static ftrace is enabledSteven Rostedt2012-01-071-0/+1
| | * | | ftrace: Allow access to the boot time function enablingSteven Rostedt2011-12-211-0/+3
| | * | | ftrace: Decouple hash items from showing filtered functionsSteven Rostedt2011-12-211-2/+3
| | * | | ftrace: Allow other users of function tracing to use the output listingSteven Rostedt2011-12-211-0/+35
| | * | | ftrace: Replace record newlist with record page listSteven Rostedt2011-12-211-4/+1
| | * | | ftrace: Remove usage of "freed" recordsSteven Rostedt2011-12-211-1/+0
| | * | | ftrace: Allow archs to modify code without stop machineSteven Rostedt2011-12-211-0/+31
| | * | | ftrace: Do not function trace inlined functionsSteven Rostedt2011-12-211-0/+5
* | | | | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-144-53/+22
|\ \ \ \ \
| * | | | | capabilities: remove __cap_full_set definitionEric Paris2012-01-051-1/+0
| * | | | | security: remove the security_netlink_recv hook as it is equivalent to capable()Eric Paris2012-01-051-14/+0
| * | | | | ptrace: do not audit capability check when outputing /proc/pid/statEric Paris2012-01-051-2/+3
| * | | | | capabilities: remove task_ns_* functionsEric Paris2012-01-052-3/+4
| * | | | | capabilites: introduce new has_ns_capabilities_noauditEric Paris2012-01-051-0/+2
| * | | | | capabilities: remove all _real_ interfacesEric Paris2012-01-051-25/+0
| * | | | | capabilities: introduce security_capable_noauditEric Paris2012-01-051-0/+7
| * | | | | capabilities: reverse arguments to security_capableEric Paris2012-01-051-3/+3
| * | | | | capabilities: remove the task from capable LSM hook entirelyEric Paris2012-01-051-9/+7
* | | | | | Merge tag 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarina...Linus Torvalds2012-01-141-0/+8
|\ \ \ \ \ \
| * | | | | | kmemleak: Handle percpu memory allocationCatalin Marinas2011-12-021-0/+8
* | | | | | | Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headersLinus Torvalds2012-01-1411-22/+47
|\ \ \ \ \ \ \
| * | | | | | | UAPI: Split trivial #if defined(__KERNEL__) && X conditionalsDavid Howells2011-12-131-1/+3
| * | | | | | | UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.hDavid Howells2011-12-131-1/+3