summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2007-05-072-9/+9
|\
| * [SCSI] esp_scsi: Fix section mismatch warnings.Martin Habets2007-05-071-1/+1
| * [VIDEO] sunxvr2500: Fix PCI device ID table.David S. Miller2007-05-071-8/+8
* | Fix bluetooth HCI sysfs compileLinus Torvalds2007-05-071-2/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6Linus Torvalds2007-05-0724-106/+1861
|\
| * Pull mem-attribute into release branchTony Luck2007-04-306-58/+392
| |\
| | * [IA64] update memory attribute aliasing documentation & test casesBjorn Helgaas2007-03-302-34/+284
| | * [IA64] fail mmaps that span areas with incompatible attributesBjorn Helgaas2007-03-301-3/+43
| | * [IA64] allow WB /sys/.../legacy_mem mmapsBjorn Helgaas2007-03-301-2/+0
| | * [IA64] make ioremap avoid unsupported attributesBjorn Helgaas2007-03-302-10/+56
| | * [IA64] rename ioremap variables to match i386Bjorn Helgaas2007-03-301-13/+13
| * | Pull percpu-dtc into release branchTony Luck2007-04-3012-48/+63
| |\ \
| | * | [IA64] relax per-cpu TLB requirement to DTCChen, Kenneth W2007-02-064-41/+16
| | * | [IA64] remove per-cpu ia64_phys_stacked_size_p8Chen, Kenneth W2007-02-068-7/+47
| * | | Pull error-inject into release branchTony Luck2007-04-306-0/+1406
| |\ \ \
| | * | | [IA64] Fix example error injection programTony Luck2007-02-051-1/+1
| | * | | [IA64] Itanium MC Error Injection Tool: pal_mc_error_inject() interfaceFenghua Yu2007-01-291-0/+33
| | * | | [IA64] Itanium MC Error Injection Tool: Makefile changesFenghua Yu2007-01-291-0/+1
| | * | | [IA64] Itanium MC Error Injection Tool: Driver sysfs interfaceFenghua Yu2007-01-291-0/+293
| | * | | [IA64] Itanium MC Error Injection Tool: Doc and sample applicationFenghua Yu2007-01-291-0/+1068
| | * | | [IA64] Itanium MC Error Injection Tool: Kernel configurationFenghua Yu2007-01-292-0/+11
* | | | | Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2007-05-0715-205/+546
|\ \ \ \ \
| * | | | | gfs2: nfs lock support for gfs2Marc Eshel2007-05-062-10/+104
| * | | | | lockd: add code to handle deferred lock requestsMarc Eshel2007-05-064-7/+40
| * | | | | lockd: always preallocate block in nlmsvc_lock()Marc Eshel2007-05-061-23/+11
| * | | | | lockd: handle test_lock deferralsMarc Eshel2007-05-063-16/+73
| * | | | | lockd: pass cookie in nlmsvc_testlockMarc Eshel2007-05-064-6/+7
| * | | | | lockd: handle fl_grant callbacksMarc Eshel2007-05-061-4/+87
| * | | | | lockd: save lock state on deferralMarc Eshel2007-05-062-0/+35
| * | | | | locks: add fl_grant callback for asynchronous lock returnMarc Eshel2007-05-062-0/+20
| * | | | | nfsd4: Convert NFSv4 to new lock interfaceMarc Eshel2007-05-061-7/+13
| * | | | | locks: add lock cancel commandMarc Eshel2007-05-063-0/+21
| * | | | | locks: allow {vfs,posix}_lock_file to return conflicting lockMarc Eshel2007-05-065-36/+32
| * | | | | locks: factor out generic/filesystem switch from setlock codeMarc Eshel2007-05-062-32/+37
| * | | | | locks: factor out generic/filesystem switch from test_lockJ. Bruce Fields2007-05-062-13/+26
| * | | | | locks: give posix_test_lock same interface as ->lockMarc Eshel2007-05-068-51/+32
| * | | | | locks: make ->lock release private data before returning in GETLK caseJ. Bruce Fields2007-05-062-4/+1
| * | | | | locks: create posix-to-flock helper functionsJ. Bruce Fields2007-04-161-25/+36
| * | | | | locks: trivial removal of unnecessary parenthesesJ. Bruce Fields2007-04-161-2/+2
* | | | | | Fix up SLUB compileLinus Torvalds2007-05-071-3/+3
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2007-05-0726-2059/+2158
|\ \ \ \ \ \
| * | | | | | [GFS2] Uncomment sprintf_symbol calling codeSteven Whitehouse2007-05-011-12/+0
| * | | | | | [DLM] lowcomms styleDavid Teigland2007-05-011-30/+37
| * | | | | | [GFS2] printk warning fixesakpm@linux-foundation.org2007-05-011-4/+7
| * | | | | | [GFS2] Patch to fix mmap of stuffed filesSteven Whitehouse2007-05-011-3/+14
| * | | | | | [GFS2] use lib/parser for parsing mount optionsJosef Bacik2007-05-011-96/+143
| * | | | | | [DLM] Lowcomms nodeid range & initialisation fixesPatrick Caulfield2007-05-011-9/+9
| * | | | | | [DLM] Fix dlm_lowcoms_stop hangJosef Bacik2007-05-011-1/+1
| * | | | | | [DLM] fix mode mungingDavid Teigland2007-05-011-2/+80
| * | | | | | [GFS2] lockdump improvementsRobert Peterson2007-05-013-9/+21
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 02:29:03 +0000