summaryrefslogtreecommitdiffstats
path: root/drivers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-282-4/+22
|\
| *---. Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-2550-139/+225
| |\ \ \
| | | * | Merge branch 'linus' into tracing/hw-branch-tracingIngo Molnar2008-12-2450-139/+225
| | |/| | | | | |/
| * | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-251-3/+3
| |\ \ \ | | |/ / | |/| |
| * | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-1991-861/+1102
| |\ \ \
| * \ \ \ Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing...Ingo Molnar2008-12-0546-290/+393
| |\ \ \ \
| * \ \ \ \ Merge commit 'v2.6.28-rc7' into tracing/coreIngo Molnar2008-12-04136-1491/+1748
| |\ \ \ \ \
| * | | | | | blktrace: port to tracepoints, updateIngo Molnar2008-11-261-0/+2
| * | | | | | blktrace: port to tracepointsArnaldo Carvalho de Melo2008-11-261-3/+3
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. \ \ \ \ \ Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' in...Ingo Molnar2008-11-2339-165/+241
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-19204-1039/+8873
| |\| | | | | | | | | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-1266-779/+474
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-1174-377/+1767
| |\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-086-108/+131
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ftrace: sysrq-z to dump the buffersPeter Zijlstra2008-11-041-1/+17
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-2815-97/+593
|\ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/coreIngo Molnar2008-12-2524-73/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge branch 'x86/tsc' into x86/coreIngo Molnar2008-12-231-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | x86: support always running TSC on Intel CPUsVenki Pallipadi2008-12-161-3/+3
| | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \
| *---------------------------------------. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump',...Ingo Molnar2008-12-2314-94/+590
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | | | | | | | | | |/| | | | | | | | | | | | | | | / / / / / / | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|/ / / / / / | | | | | | | | | | | | | | | | | | | |/| | | | | | | / / / / / | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | / / / | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | * | | | | | | xen: clean up asm/xen/hypervisor.hJeremy Fitzhardinge2008-12-163-2/+9
| | | | | | | | | | | | | | | | | | | | | | |/ / / / / /
| | | | | | | | | | | | | | | | | | | | | * | | | | | | sgi-xp: xpc needs to pass the physical address, not virtualRuss Anderson2008-12-161-4/+4
| | | | | | | | | | | | | | | | | | | | | * | | | | | | Merge commit 'v2.6.28-rc8' into x86/uvIngo Molnar2008-12-16246-2266/+2967
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * | | | | | | Merge branch 'linus' into x86/uvIngo Molnar2008-11-20572-5186/+14039
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | | | | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * | | | | | | x86, UV: fix redundant creation of sgi_uvCliff Wickman2008-11-111-1/+0
| | | | | | | | | | | | | | | | | | | | | * | | | | | | sgi-xp: support getting the address of a partition's reserved pageDean Nelson2008-11-061-3/+28
| | | | | | | | | | | | | | | | | | | | | * | | | | | | sgi-xp: define xp_partition_id and xp_region_sizeDean Nelson2008-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | * | | | | | | sgi-xp: create activate and notify gru message queuesDean Nelson2008-11-062-53/+218
| | | | | | | | | | | | | | | | | | | | | * | | | | | | sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()Dean Nelson2008-11-065-12/+117
| | | | | | | | | | | | | | | | * | | | | | | | | | | | Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirksIngo Molnar2008-10-284144-214733/+708161
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / | | | | | | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | | | | | | * | | | | | | | | | | | x86, pci: introduce config option for pci reroute quirks (was: [PATCH 0/3] Bo...Stefan Assmann2008-07-181-1/+1
| | | | | | | | | | | | | | | | * | | | | | | | | | | | Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirksIngo Molnar2008-07-181133-97293/+55821
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | PCI quirks: call boot IRQ quirks at end of device init and during resumeOlaf Dabrunz2008-07-131-13/+24
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | PCI quirks: disable AMD/ATI legacy boot interrupt generationOlaf Dabrunz2008-07-131-21/+50
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | PCI quirks: add quirk to disable boot interrupt generation on broadcom HT1000Olaf Dabrunz2008-07-131-0/+32
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirksIngo Molnar2008-07-1353-98/+266
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent, warning...Bernhard Walle2008-07-081-2/+0
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalentStefan Assmann2008-07-082-0/+84
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | pci: add quirk to disable boot interrupt generation on intel 6300ESBStefan Assmann2008-07-081-0/+30
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | x86: vmware: look for DMI string in the product serial keyAlok Kataria2008-11-041-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2008-12-289-35/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'next' into for-linusJames Morris2008-12-259-35/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audit: Log TIOCSTIAl Viro2008-12-092-17/+62
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into nextJames Morris2008-12-04212-1943/+2385
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into nextJames Morris2008-11-18101-567/+1149
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nextJames Morris2008-11-14225-1566/+9865
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRED: Use creds in file structsDavid Howells2008-11-141-2/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRED: Use RCU to access another task's creds and to release a task's own credsDavid Howells2008-11-141-5/+11
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRED: Wrap current->cred and a few other accessorsDavid Howells2008-11-142-7/+11
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRED: Separate task security context from task_structDavid Howells2008-11-141-4/+4